Skip to content
Snippets Groups Projects
Commit 2395f4ac authored by Nico's avatar Nico
Browse files

add logging

parent 99bb1b70
No related branches found
No related tags found
No related merge requests found
...@@ -9,11 +9,16 @@ import pprint ...@@ -9,11 +9,16 @@ import pprint
import requests import requests
import argparse import argparse
import datetime import datetime
import logging
ap = argparse.ArgumentParser() ap = argparse.ArgumentParser()
ap.add_argument("--raw", type=argparse.FileType("r", encoding="utf-8"), required=True) 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() args = ap.parse_args()
if args.debug:
logging.basicConfig(level=logging.DEBUG)
def filterNonAscii(s): def filterNonAscii(s):
return s.encode("ascii", errors="ignore").decode() return s.encode("ascii", errors="ignore").decode()
...@@ -82,7 +87,7 @@ try: ...@@ -82,7 +87,7 @@ try:
access += open("/var/log/nginx/access.log").read() access += open("/var/log/nginx/access.log").read()
except: except:
print("not using /var/log/nginx/access.log") logging.warning("not using /var/log/nginx/access.log")
try: try:
access += open("access.log").read() access += open("access.log").read()
except: except:
...@@ -100,11 +105,12 @@ json.dump(allFirmwareDownloads,open("firmwareDownloads.json","w"),sort_keys=True ...@@ -100,11 +105,12 @@ json.dump(allFirmwareDownloads,open("firmwareDownloads.json","w"),sort_keys=True
data = json.load(args.raw) data = json.load(args.raw)
updateEvents = []
for download in allFirmwareDownloads: for download in allFirmwareDownloads:
try: try:
r = LogRecord(download) r = LogRecord(download)
except LogRecordParseError as e: except LogRecordParseError as e:
print("error parsing line, skipping: {}".format(e.record_line)) logging.debug("error parsing line, skipping: {}".format(e.record_line))
continue continue
mac = ipv62mac(r.ipv6) mac = ipv62mac(r.ipv6)
...@@ -123,4 +129,4 @@ for download in allFirmwareDownloads: ...@@ -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 # 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]") 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): 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))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment