William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-01-18 16:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added log format

Browse Source
This commit is contained in:
Mark Qvist 2025-01-12 18:51:27 +01:00
parent 53df2fa5e0
commit eafa4aefbb
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RNS/__init__.py
View File

@ -24,6 +24,7 @@ import os
import sys import sys
import glob import glob
import time import time
import datetime
import random import random
import threading import threading
@ -68,6 +69,7 @@ logfile = None
logdest = LOG_STDOUT logdest = LOG_STDOUT
logcall = None logcall = None
logtimefmt = "%Y-%m-%d %H:%M:%S" logtimefmt = "%Y-%m-%d %H:%M:%S"
logtimefmt_p = "%H:%M:%S.%f"
compact_log_fmt = False compact_log_fmt = False
instance_random = random.Random() instance_random = random.Random()
@ -108,14 +110,20 @@ def timestamp_str(time_s):
timestamp = time.localtime(time_s) timestamp = time.localtime(time_s)
return time.strftime(logtimefmt, timestamp) return time.strftime(logtimefmt, timestamp)
def log(msg, level=3, _override_destination = False): def precise_timestamp_str(time_s):
return datetime.datetime.now().strftime(logtimefmt_p)[:-3]
def log(msg, level=3, _override_destination = False, pt=False):
global _always_override_destination, compact_log_fmt global _always_override_destination, compact_log_fmt
msg = str(msg) msg = str(msg)
if loglevel >= level: if loglevel >= level:
if not compact_log_fmt: if pt:
logstring = "["+timestamp_str(time.time())+"] ["+loglevelname(level)+"] "+msg logstring = "["+precise_timestamp_str(time.time())+"] ["+loglevelname(level)+"] "+msg
else: else:
logstring = "["+timestamp_str(time.time())+"] "+msg if not compact_log_fmt:
logstring = "["+timestamp_str(time.time())+"] ["+loglevelname(level)+"] "+msg
else:
logstring = "["+timestamp_str(time.time())+"] "+msg
logging_lock.acquire() logging_lock.acquire()