ua1zbe
/
trackdirect2
mirror of https://github.com/qvarforth/trackdirect
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add print informations if config missing

This commit is contained in:
Dashie 2022-08-09 09:35:51 +02:00
parent 814a9b54fc
commit b12ee46ef4
No known key found for this signature in database
GPG Key ID: C2D57B325840B755
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/bin/collector.py
View File

@ -11,9 +11,11 @@ if __name__ == '__main__':
sys.exit() sys.exit()
elif (sys.argv[1].startswith("/")): elif (sys.argv[1].startswith("/")):
if (not os.path.isfile(sys.argv[1])): if (not os.path.isfile(sys.argv[1])):
print(f"\n File {sys.argv[1]} does not exists")
print("\n" + sys.argv[0] + ' [config.ini] [collector number]') print("\n" + sys.argv[0] + ' [config.ini] [collector number]')
sys.exit() sys.exit()
elif (not os.path.isfile(os.path.expanduser('~/trackdirect/config/' + sys.argv[1]))): elif (not os.path.isfile(os.path.expanduser('~/trackdirect/config/' + sys.argv[1]))):
print(f"\n File ~/trackdirect/config/{sys.argv[1]} does not exists")
print("\n" + sys.argv[0] + ' [config.ini] [collector number]') print("\n" + sys.argv[0] + ' [config.ini] [collector number]')
sys.exit() sys.exit()

10
server/bin/remover.py
View File

@ -1,9 +1,7 @@
import trackdirect
import sys import sys
import os.path import os.path
import logging import logging
import logging.handlers import logging.handlers
import psycopg2
import psycopg2.extras import psycopg2.extras
import datetime import datetime
import time import time
@ -16,14 +14,16 @@ from trackdirect.repositories.PacketRepository import PacketRepository
if __name__ == '__main__': if __name__ == '__main__':
if (len(sys.argv) < 2): if (len(sys.argv) < 2):
print "\n" + sys.argv[0] + ' [config.ini]' print("\n" + sys.argv[0] + ' [config.ini]')
sys.exit() sys.exit()
elif (sys.argv[1].startswith("/")): elif (sys.argv[1].startswith("/")):
if (not os.path.isfile(sys.argv[1])): if (not os.path.isfile(sys.argv[1])):
print "\n" + sys.argv[0] + ' [config.ini]' print(f"\n File {sys.argv[1]} does not exists")
print("\n" + sys.argv[0] + ' [config.ini]')
sys.exit() sys.exit()
elif (not os.path.isfile(os.path.expanduser('~/trackdirect/config/' + sys.argv[1]))): elif (not os.path.isfile(os.path.expanduser('~/trackdirect/config/' + sys.argv[1]))):
print "\n" + sys.argv[0] + ' [config.ini]' print(f"\n File ~/trackdirect/config/{sys.argv[1]} does not exists")
print("\n" + sys.argv[0] + ' [config.ini]')
sys.exit() sys.exit()
config = TrackDirectConfig() config = TrackDirectConfig()

11
server/bin/stationremover.py
View File

@ -1,10 +1,7 @@
import trackdirect
import sys import sys
import os.path import os.path
import logging import logging
import logging.handlers import logging.handlers
import psycopg2
import psycopg2.extras
import datetime import datetime
import time import time
@ -15,14 +12,16 @@ from trackdirect.TrackDirectConfig import TrackDirectConfig
if __name__ == '__main__': if __name__ == '__main__':
if (len(sys.argv) < 3): if (len(sys.argv) < 3):
print "\n" + sys.argv[0] + ' [config.ini] [staion id]' print("\n" + sys.argv[0] + ' [config.ini] [staion id]')
sys.exit() sys.exit()
elif (sys.argv[1].startswith("/")): elif (sys.argv[1].startswith("/")):
if (not os.path.isfile(sys.argv[1])): if (not os.path.isfile(sys.argv[1])):
print "\n" + sys.argv[0] + ' [config.ini] [staion id]' print(f"\n File {sys.argv[1]} does not exists")
print("\n" + sys.argv[0] + ' [config.ini] [staion id]')
sys.exit() sys.exit()
elif (not os.path.isfile(os.path.expanduser('~/trackdirect/config/' + sys.argv[1]))): elif (not os.path.isfile(os.path.expanduser('~/trackdirect/config/' + sys.argv[1]))):
print "\n" + sys.argv[0] + ' [config.ini] [staion id]' print(f"\n File ~/trackdirect/config/{sys.argv[1]} does not exists")
print("\n" + sys.argv[0] + ' [config.ini] [staion id]')
sys.exit() sys.exit()
stationId = sys.argv[2] stationId = sys.argv[2]