From b1f17027d52f854bdadb6f1b666723f210bc72f2 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 2 Feb 2022 15:27:22 +0100 Subject: [PATCH] add logging to stdout --- server/bin/collector.py | 16 ++++++++++------ server/bin/heatmapcreator.py | 5 ++++- server/bin/remover.py | 6 ++++-- server/bin/stationremover.py | 5 ++++- server/bin/wsserver.py | 9 +++++++-- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/server/bin/collector.py b/server/bin/collector.py index d206d00..cc1706c 100644 --- a/server/bin/collector.py +++ b/server/bin/collector.py @@ -20,31 +20,35 @@ if __name__ == '__main__': config = trackdirect.TrackDirectConfig() config.populate(sys.argv[1]) - if (len(sys.argv) < 3) : + if (len(sys.argv) < 3): collectorNumber = 0 - else : + else: collectorNumber = int(sys.argv[2]) collectorOptions = config.collector[collectorNumber] saveOgnStationsWithMissingIdentity = False - if (config.saveOgnStationsWithMissingIdentity) : + if (config.saveOgnStationsWithMissingIdentity): saveOgnStationsWithMissingIdentity = True fh = logging.handlers.RotatingFileHandler(filename=os.path.expanduser( collectorOptions['error_log']), mode='a', maxBytes=1000000, backupCount=10) - fh.setLevel(logging.WARNING) formatter = logging.Formatter( '%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) + consoleHandler = logging.StreamHandler() + consoleHandler.setFormatter(formatter) + trackDirectLogger = logging.getLogger('trackdirect') trackDirectLogger.addHandler(fh) - trackDirectLogger.setLevel(logging.WARNING) + trackDirectLogger.addHandler(consoleHandler) + trackDirectLogger.setLevel(logging.INFO) aprslibLogger = logging.getLogger('aprslib.IS') aprslibLogger.addHandler(fh) - aprslibLogger.setLevel(logging.WARNING) + aprslibLogger.addHandler(consoleHandler) + aprslibLogger.setLevel(logging.INFO) trackDirectLogger.warning("Starting (Collecting from " + collectorOptions['host'] + ":" + str( collectorOptions['port_full']) + " using " + collectorOptions['callsign'] + " and " + str(collectorOptions['passcode']) + ")") diff --git a/server/bin/heatmapcreator.py b/server/bin/heatmapcreator.py index 0835f7d..683c8f3 100644 --- a/server/bin/heatmapcreator.py +++ b/server/bin/heatmapcreator.py @@ -22,14 +22,17 @@ if __name__ == '__main__': fh = logging.handlers.RotatingFileHandler(filename=os.path.expanduser( '~/trackdirect/server/log/heatmap.log'), mode='a', maxBytes=1000000, backupCount=10) - fh.setLevel(logging.INFO) formatter = logging.Formatter( '%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) + consoleHandler = logging.StreamHandler() + consoleHandler.setFormatter(formatter) + trackDirectLogger = logging.getLogger('trackdirect') trackDirectLogger.addHandler(fh) + trackDirectLogger.addHandler(consoleHandler) trackDirectLogger.setLevel(logging.INFO) trackDirectLogger.info("Starting (output directory: " + sys.argv[2] + ")") diff --git a/server/bin/remover.py b/server/bin/remover.py index d3a297b..1116319 100644 --- a/server/bin/remover.py +++ b/server/bin/remover.py @@ -37,14 +37,17 @@ if __name__ == '__main__': try: fh = logging.handlers.RotatingFileHandler(filename=os.path.expanduser( '~/trackdirect/server/log/remover_' + config.dbName + '.log'), mode='a', maxBytes=1000000, backupCount=10) - fh.setLevel(logging.INFO) formatter = logging.Formatter( '%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) + consoleHandler = logging.StreamHandler() + consoleHandler.setFormatter(formatter) + trackDirectLogger = logging.getLogger('trackdirect') trackDirectLogger.addHandler(fh) + trackDirectLogger.addHandler(consoleHandler) trackDirectLogger.setLevel(logging.INFO) trackDirectLogger.info("Starting") @@ -230,7 +233,6 @@ if __name__ == '__main__': if (deletedRows > 0): trackDirectLogger.info("Deleted %s stations" % (deletedRows)) - cursor.execute("""VACUUM ANALYZE station""") cursor.execute("""REINDEX TABLE station""") cursor.execute("""VACUUM ANALYZE sender""") diff --git a/server/bin/stationremover.py b/server/bin/stationremover.py index fca5bb4..1a7a110 100644 --- a/server/bin/stationremover.py +++ b/server/bin/stationremover.py @@ -33,14 +33,17 @@ if __name__ == '__main__': try: fh = logging.handlers.RotatingFileHandler(filename=os.path.expanduser( '~/trackdirect/server/log/stationremover.log'), mode='a', maxBytes=1000000, backupCount=10) - fh.setLevel(logging.INFO) formatter = logging.Formatter( '%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) + consoleHandler = logging.StreamHandler() + consoleHandler.setFormatter(formatter) + trackDirectLogger = logging.getLogger('trackdirect') trackDirectLogger.addHandler(fh) + trackDirectLogger.addHandler(consoleHandler) trackDirectLogger.setLevel(logging.INFO) trackDirectLogger.info("Starting") diff --git a/server/bin/wsserver.py b/server/bin/wsserver.py index d60674e..7f906c8 100644 --- a/server/bin/wsserver.py +++ b/server/bin/wsserver.py @@ -116,20 +116,25 @@ if __name__ == '__main__': fh = logging.handlers.RotatingFileHandler(filename=os.path.expanduser( config.errorLog), mode='a', maxBytes=1000000, backupCount=10) - fh.setLevel(logging.WARNING) fh.setFormatter(formatter) + consoleHandler = logging.StreamHandler() + consoleHandler.setFormatter(formatter) + trackDirectLogger = logging.getLogger('trackdirect') trackDirectLogger.addHandler(fh) + trackDirectLogger.addHandler(consoleHandler) + trackDirectLogger.setLevel(logging.INFO) fh2 = logging.handlers.RotatingFileHandler(filename=os.path.expanduser( config.errorLog), mode='a', maxBytes=1000000, backupCount=10) # aprslib is logging non important "socket error on ..." using ERROR-level - fh2.setLevel(logging.CRITICAL) fh2.setFormatter(formatter) aprslibLogger = logging.getLogger('aprslib.IS') aprslibLogger.addHandler(fh2) + aprslibLogger.addHandler(consoleHandler) + aprslibLogger.setLevel(logging.INFO) if options.fd is not None: worker(options, trackDirectLogger)