From 2395f4ac954f79bc7002d9715484beed8eb8817a Mon Sep 17 00:00:00 2001
From: nrb <freifunk@nicoboehr.de>
Date: Sun, 3 Jan 2021 10:51:20 +0100
Subject: [PATCH] add logging
---
update_checker.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/update_checker.py b/update_checker.py
index b7acde4..b787fa0 100755
--- a/update_checker.py
+++ b/update_checker.py
@@ -9,11 +9,16 @@ import pprint
import requests
import argparse
import datetime
+import logging
ap = argparse.ArgumentParser()
ap.add_argument("--raw", type=argparse.FileType("r", encoding="utf-8"), required=True)
+ap.add_argument("--debug", action="store_true", help="Output tons of debug messages")
args = ap.parse_args()
+if args.debug:
+ logging.basicConfig(level=logging.DEBUG)
+
def filterNonAscii(s):
return s.encode("ascii", errors="ignore").decode()
@@ -82,7 +87,7 @@ try:
access += open("/var/log/nginx/access.log").read()
except:
- print("not using /var/log/nginx/access.log")
+ logging.warning("not using /var/log/nginx/access.log")
try:
access += open("access.log").read()
except:
@@ -100,11 +105,12 @@ json.dump(allFirmwareDownloads,open("firmwareDownloads.json","w"),sort_keys=True
data = json.load(args.raw)
+updateEvents = []
for download in allFirmwareDownloads:
try:
r = LogRecord(download)
except LogRecordParseError as e:
- print("error parsing line, skipping: {}".format(e.record_line))
+ logging.debug("error parsing line, skipping: {}".format(e.record_line))
continue
mac = ipv62mac(r.ipv6)
@@ -123,4 +129,4 @@ for download in allFirmwareDownloads:
# raw.json only contains data from 14 days - do not print message if we encounter older log entries
download_ts = datetime.datetime.strptime(r.date, "%d/%b/%Y:%H:%M:%S %z]")
if (datetime.datetime.now(tz=datetime.timezone.utc) - download_ts) < datetime.timedelta(days=14):
- print("%s %s with agent %s seems not to be a node @ %s"%(r.ipv6,mac,r.agent,r.date))
+ logging.info("%s %s with agent %s seems not to be a node @ %s"%(r.ipv6,mac,r.agent,r.date))
--
GitLab