Update o3-base to revert previous and handle buffered stdout for logs

This commit is contained in:
Juhani Krekelä 2021-12-12 17:07:16 +02:00
commit d19fe50188
1 changed files with 13 additions and 7 deletions

View File

@ -41,31 +41,37 @@ class LoggerThread(threading.Thread):
elif message_type == logmessage_types.internal:
if message_data[0] == internal_submessage_types.quit:
assert len(message_data) == 1
print('--- Quit', file=sys.stderr)
print('--- Quit')
sys.stdout.flush()
self.dead_notify_channel.send((controlmessage_types.quit,))
break
elif message_data[0] == internal_submessage_types.error:
assert len(message_data) == 2
print('--- Error', message_data[1], file=sys.stderr)
print('--- Error', message_data[1])
sys.stdout.flush()
elif message_data[0] == internal_submessage_types.server:
assert len(message_data) == 2
assert len(message_data[1]) == 2
print(f'--- Connecting to server {message_data[1][0]}:{message_data[1][1]}', file=sys.stderr)
print(f'--- Connecting to server {message_data[1][0]}:{message_data[1][1]}')
sys.stdout.flush()
else:
print('--- ???', message_data, file=sys.stderr)
print('--- ???', message_data)
sys.stdout.flush()
# Messages about status from the bot code
elif message_type == logmessage_types.status:
assert len(message_data) == 2
print('*', end='', file=sys.stderr)
print(*message_data[0], **message_data[1], file=sys.stderr)
print('*', end='')
print(*message_data[0], **message_data[1])
sys.stdout.flush()
else:
print('???', message_type, message_data, file=sys.stderr)
print('???', message_type, message_data)
sys.stdout.flush()
# API(serverthread_object)
# Create a new API object corresponding to given ServerThread object