Updated logging

markqvist · Jan 21, 2025 · fd6d8ff · fd6d8ff
1 parent 06de7f4
commit fd6d8ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/RNS/Reticulum.py b/RNS/Reticulum.py
@@ -302,7 +302,7 @@ def __init__(self,configdir=None, loglevel=None, logdest=None, verbosity=None, r
             time.sleep(1.5)
 
         self.__apply_config()
-        RNS.log(f"Utilising cryptography backend \"{RNS.Cryptography.Provider.backend()}\"", RNS.LOG_VERBOSE)
+        RNS.log(f"Utilising cryptography backend \"{RNS.Cryptography.Provider.backend()}\"", RNS.LOG_DEBUG)
         RNS.log(f"Configuration loaded from {self.configpath}", RNS.LOG_VERBOSE)
 
         RNS.Identity.load_known_destinations()

diff --git a/RNS/__init__.py b/RNS/__init__.py
@@ -81,21 +81,21 @@
 
 def loglevelname(level):
     if (level == LOG_CRITICAL):
-        return "Critical"
+        return "[Critical]"
     if (level == LOG_ERROR):
-        return "Error"
+        return "[Error]   "
     if (level == LOG_WARNING):
-        return "Warning"
+        return "[Warning] "
     if (level == LOG_NOTICE):
-        return "Notice"
+        return "[Notice]  "
     if (level == LOG_INFO):
-        return "Info"
+        return "[Info]    "
     if (level == LOG_VERBOSE):
-        return "Verbose"
+        return "[Verbose] "
     if (level == LOG_DEBUG):
-        return "Debug"
+        return "[Debug]   "
     if (level == LOG_EXTREME):
-        return "Extra"
+        return "[Extra]   "
 
     return "Unknown"
 
@@ -118,12 +118,12 @@ def log(msg, level=3, _override_destination = False, pt=False):
     msg = str(msg)
     if loglevel >= level:
         if pt:
-            logstring = "["+precise_timestamp_str(time.time())+"] ["+loglevelname(level)+"] "+msg
+            logstring = "["+precise_timestamp_str(time.time())+"] "+loglevelname(level)+" "+msg
         else:
             if not compact_log_fmt:
-                logstring = "["+timestamp_str(time.time())+"] ["+loglevelname(level)+"] "+msg
+                logstring = "["+timestamp_str(time.time())+"] "+loglevelname(level)+" "+msg
             else:
-                logstring = "["+timestamp_str(time.time())+"] "+msg
+                logstring = "["+timestamp_str(time.time())+" "+msg
 
         with logging_lock:
             if (logdest == LOG_STDOUT or _always_override_destination or _override_destination):