From b12ee46ef43df7df0fa8cdc8731e6e268f9fa548 Mon Sep 17 00:00:00 2001 From: Dashie Date: Tue, 9 Aug 2022 09:35:51 +0200 Subject: [PATCH] Add print informations if config missing --- server/bin/collector.py | 2 ++ server/bin/remover.py | 10 +++++----- server/bin/stationremover.py | 11 +++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/server/bin/collector.py b/server/bin/collector.py index cc1706c..7025864 100644 --- a/server/bin/collector.py +++ b/server/bin/collector.py @@ -11,9 +11,11 @@ if __name__ == '__main__': sys.exit() elif (sys.argv[1].startswith("/")): 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]') sys.exit() 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]') sys.exit() diff --git a/server/bin/remover.py b/server/bin/remover.py index 1116319..d375cd2 100644 --- a/server/bin/remover.py +++ b/server/bin/remover.py @@ -1,9 +1,7 @@ -import trackdirect import sys import os.path import logging import logging.handlers -import psycopg2 import psycopg2.extras import datetime import time @@ -16,14 +14,16 @@ from trackdirect.repositories.PacketRepository import PacketRepository if __name__ == '__main__': if (len(sys.argv) < 2): - print "\n" + sys.argv[0] + ' [config.ini]' + print("\n" + sys.argv[0] + ' [config.ini]') sys.exit() elif (sys.argv[1].startswith("/")): 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() 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() config = TrackDirectConfig() diff --git a/server/bin/stationremover.py b/server/bin/stationremover.py index 1a7a110..5cc52c1 100644 --- a/server/bin/stationremover.py +++ b/server/bin/stationremover.py @@ -1,10 +1,7 @@ -import trackdirect import sys import os.path import logging import logging.handlers -import psycopg2 -import psycopg2.extras import datetime import time @@ -15,14 +12,16 @@ from trackdirect.TrackDirectConfig import TrackDirectConfig if __name__ == '__main__': 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() elif (sys.argv[1].startswith("/")): 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() 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() stationId = sys.argv[2]