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

Merge pull request #3 from peterus/logging 

improve logging
This commit is contained in:
Per Qvarforth 2022-02-02 22:01:52 +01:00 committed by GitHub
parent bf7146f27e 37d0cd1628
commit 2afed98d35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/bin/collector.py
View File

@ -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']) + ")")

5
server/bin/heatmapcreator.py
View File

@ -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] + ")")

6
server/bin/remover.py
View File

@ -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""")

5
server/bin/stationremover.py
View File

@ -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")

14
server/bin/wsserver.py
View File

@ -35,9 +35,8 @@ def master(options, trackDirectLogger):
site = Site(root)
port = reactor.listenTCP(config.websocketPort, site)
port.stopReading()
for i in range(options.workers):
for i in range(options.workers - 1):
args = [sys.executable, "-u", __file__]
args.extend(sys.argv[1:])
args.extend(["--fd", str(port.fileno()), "--cpuid", str(i)])
@ -47,7 +46,7 @@ def master(options, trackDirectLogger):
childFDs={0: 0, 1: 1, 2: 2, port.fileno(): port.fileno()},
env=os.environ)
# reactor.run()
reactor.run()
except Exception as e:
trackDirectLogger.error(e, exc_info=1)
@ -116,20 +115,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)

2
server/scripts/collector.sh
View File

@ -17,6 +17,6 @@ else
export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/
cd $CURRENTDIR/..
python2 ./bin/collector.py $CONFIGFILE $COLLECTORNUMBER 2>&1 &
python2 ./bin/collector.py $CONFIGFILE $COLLECTORNUMBER
exit 0
fi

2
server/scripts/heatmapcreator.sh
View File

@ -17,6 +17,6 @@ else
export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/
cd $CURRENTDIR/..
python2 $CURRENTDIR/../bin/heatmapcreator.py $CONFIGFILE $DESTDIR 2>&1 &
python2 $CURRENTDIR/../bin/heatmapcreator.py $CONFIGFILE $DESTDIR
exit 0
fi

2
server/scripts/wsserver.sh
View File

@ -15,6 +15,6 @@ else
export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/
cd $CURRENTDIR/..
python2 $CURRENTDIR/../bin/wsserver.py --config $CONFIGFILE 2>&1 &
python2 $CURRENTDIR/../bin/wsserver.py --config $CONFIGFILE
exit 0
fi

2
server/trackdirect/TrackDirectWebsocketServer.py
View File

@ -435,4 +435,4 @@ class TrackDirectWebsocketServer(WebSocketServerProtocol):
self.connectionState.setLatestMinutes(request["minutes"], None)
if ("noRealTime" in request):
self.connectionState.disableRealTime()
self.connectionState.disableRealTime()