D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: [Worker 8] fix buffer type

pull/8/head
Terrtia 2019-02-11 10:14:05 +01:00
parent e7c83391b4
commit fe22c69512
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/web/templates/sensors_status.html
View File

@ -21,7 +21,7 @@
<body> <body>
<nav class="navbar navbar-expand-sm navbar-dark bg-dark"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="{{ url_for('index') }}"> <a class="navbar-brand" href="{{ url_for('index') }}">
<img src="{{ url_for('static', filename='img/d4-logo.png')}}" alt="D4 Project" style="width:80px;"> <img src="{{ url_for('static', filename='img/d4-logo.png')}}" alt="D4 Project" style="width:80px;">
</a> </a>

13
server/workers/workers_8/worker.py
View File

@ -37,6 +37,8 @@ rotation_save_cycle = 300 #seconds
analyzer_list_max_default_size = 10000 analyzer_list_max_default_size = 10000
max_buffer_length = 10000
save_to_file = True save_to_file = True
def get_save_dir(dir_data_uuid, year, month, day): def get_save_dir(dir_data_uuid, year, month, day):
@ -54,7 +56,7 @@ if __name__ == "__main__":
session_uuid = sys.argv[1] session_uuid = sys.argv[1]
stream_name = 'stream:{}:{}'.format(type, session_uuid) stream_name = 'stream:{}:{}'.format(type, session_uuid)
id = '0' id = '0'
buffer = None buffer = b''
# track launched worker # track launched worker
redis_server_stream.sadd('working_session_uuid:{}'.format(type), session_uuid) redis_server_stream.sadd('working_session_uuid:{}'.format(type), session_uuid)
@ -89,9 +91,9 @@ if __name__ == "__main__":
if id and data: if id and data:
# reconstruct data # reconstruct data
if buffer: if buffer != b'':
data[b'message'] = '{}{}'.format(buffer, data[b'message']) data[b'message'] = '{}{}'.format(buffer, data[b'message'])
buffer = None buffer = b''
# send data to redis # send data to redis
# new line in received data # new line in received data
@ -110,7 +112,12 @@ if __name__ == "__main__":
if all_line[-1] != b'': if all_line[-1] != b'':
buffer += data[b'message'] buffer += data[b'message']
else: else:
if len(buffer) < max_buffer_length:
buffer += data[b'message'] buffer += data[b'message']
else:
print('Error, infinite loop, buffer may length reached')
# force new line
buffer += b'{}\n'.format(data[b'message'])
# save data on disk # save data on disk