Skip to content

Commit 84dd9ca

Browse files
committed
qtvcp -machine_log: trap an error when stripping newlines
a 'None' message can't have newlines!
1 parent f3e2ed2 commit 84dd9ca

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

lib/python/qtvcp/lib/machine_log.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,21 @@ def __init__(self):
2020
self.mlp = os.path.expanduser(INFO.MACHINE_LOG_HISTORY_PATH)
2121

2222
def log_it(self, w, message, option=None):
23-
message =message.rstrip('\n')
24-
25-
if option == 'TIME':
26-
self.log_message_time(message)
27-
elif option == 'DATE':
28-
self.log_message_date(message)
29-
elif option == 'DELETE':
23+
if option == 'DELETE':
3024
self.delete_log()
31-
elif option == 'INITIAL':
32-
self.initial_greeting()
33-
else:
34-
self.log_message(message)
25+
return
26+
try:
27+
message = message.rstrip('\n')
28+
if option == 'TIME':
29+
self.log_message_time(message)
30+
elif option == 'DATE':
31+
self.log_message_date(message)
32+
elif option == 'INITIAL':
33+
self.initial_greeting()
34+
else:
35+
self.log_message(message)
36+
except Exception as e:
37+
log.exception('log_it function: {}'.format(e))
3538

3639
def initial_greeting(self):
3740
try:

0 commit comments

Comments
 (0)