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

chg: [d4-analyzer-stdout] catch FileNotFoundError + only append one file + helper: fix required arguments

pull/24/head
Terrtia 2019-06-17 14:44:04 +02:00
parent c19e43c931
commit 85f2964c6c
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/analyzer/analyzer-d4-stdout/d4-stdout.py
View File

@ -13,10 +13,10 @@ import logging.handlers
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Export d4 data to stdout') parser = argparse.ArgumentParser(description='Export d4 data to stdout')
parser.add_argument('-f', '--files', help='read data from files. trth', action="store_true") parser.add_argument('-t', '--type', help='d4 type' , type=int, dest='type', required=True)
parser.add_argument('-u', '--uuid', help='queue uuid' , type=str, dest='uuid', required=True)
parser.add_argument('-f', '--files', help='read data from files. Append file to stdin', action="store_true")
parser.add_argument('-n', '--newline', help='add new lines', action="store_true") parser.add_argument('-n', '--newline', help='add new lines', action="store_true")
parser.add_argument('-t', '--type', help='d4 type' , type=int, dest='type')
parser.add_argument('-u', '--uuid', help='queue uuid' , type=str, dest='uuid')
parser.add_argument('-i', '--ip',help='redis host' , type=str, default='127.0.0.1', dest='host_redis') parser.add_argument('-i', '--ip',help='redis host' , type=str, default='127.0.0.1', dest='host_redis')
parser.add_argument('-p', '--port',help='redis port' , type=int, default=6380, dest='port_redis') parser.add_argument('-p', '--port',help='redis port' , type=int, default=6380, dest='port_redis')
args = parser.parse_args() args = parser.parse_args()
@ -66,8 +66,14 @@ if __name__ == "__main__":
time.sleep(1) time.sleep(1)
continue continue
if read_files: if read_files:
try:
with open(d4_data, 'rb') as f: with open(d4_data, 'rb') as f:
sys.stdout.buffer.write(f.read()) sys.stdout.buffer.write(f.read())
sys.exit(0)
except FileNotFoundError:
## TODO: write logs file
continue
else: else:
if newLines: if newLines:
sys.stdout.buffer.write(d4_data + b'\n') sys.stdout.buffer.write(d4_data + b'\n')