X-Git-Url: https://mudpy.org/gitweb?a=blobdiff_plain;f=mudpy%2Fmisc.py;h=df17211d73d0a18a6bab5a215837d95b91676a85;hb=6f30c3687aa92729c549132b47825f1f9fedd6bd;hp=c0f73a1faf6af70d44b7b5620de8acda50811c28;hpb=3b59b8a74388427be4e06d0dad558d597ee34ef4;p=mudpy.git

diff --git a/mudpy/misc.py b/mudpy/misc.py
index c0f73a1..df17211 100644
--- a/mudpy/misc.py
+++ b/mudpy/misc.py
@@ -405,6 +405,11 @@ class Universe:
             element.update_location()
             element.clean_contents()
 
+        # warn when debug mode has been engaged
+        if self.debug_mode():
+            pending_loglines.append((
+                "WARNING: Unsafe debugging mode is enabled!", 6))
+
         # done loading, so disallow updating elements from read-only files
         self.loading = False
 
@@ -1085,14 +1090,14 @@ def log(message, level=0):
     for line in lines:
         while 0 < len(universe.loglines) >= max_log_lines:
             del universe.loglines[0]
-        universe.loglines.append((level, timestamp + " " + line))
+        universe.loglines.append((timestamp + " " + line, level))
 
 
 def get_loglines(level, start, stop):
     """Return a specific range of loglines filtered by level."""
 
     # filter the log lines
-    loglines = [x for x in universe.loglines if x[0] >= level]
+    loglines = [x for x in universe.loglines if x[1] >= level]
 
     # we need these in several places
     total_count = str(len(universe.loglines))
@@ -1114,11 +1119,10 @@ def get_loglines(level, start, stop):
             stop = 1
 
         # some preamble
-        message = "There are " + str(total_count)
-        message += " log lines in memory and " + str(filtered_count)
-        message += " at or above level " + str(level) + "."
-        message += " The matching lines from " + str(stop) + " to "
-        message += str(start) + " are:$(eol)$(eol)"
+        message = (
+            "There are %s log lines in memory and %s at or above level %s. "
+            "The matching lines from %s to %s are:$(eol)$(eol)" %
+            (total_count, filtered_count, level, stop, start))
 
         # add the text from the selected lines
         if stop > 1:
@@ -1126,14 +1130,13 @@ def get_loglines(level, start, stop):
         else:
             range_lines = loglines[-start:]
         for line in range_lines:
-            message += "   (" + str(line[0]) + ") " + line[1].replace(
-                "$(", "$_("
-            ) + "$(eol)"
+            message += "   (%s) %s$(eol)" % (
+                line[1], line[0].replace("$(", "$_("))
 
     # there were no lines
     else:
-        message = "None of the " + str(total_count)
-        message += " lines in memory matches your request."
+        message = "None of the %s lines in memory matches your request." % (
+            total_count)
 
     # pass it back
     return message
@@ -1465,9 +1468,9 @@ def reload_data():
     old_loglines = universe.loglines[:]
     for element in list(universe.contents.values()):
         element.destroy()
-    universe.load()
+    pending_loglines = universe.load()
     new_loglines = universe.loglines[:]
-    universe.loglines = old_loglines + new_loglines
+    universe.loglines = old_loglines + new_loglines + pending_loglines
     for user in old_userlist:
         user.reload()
 
@@ -2120,8 +2123,6 @@ def setup():
     log("Running version: %s" % universe.versions.version, 1)
     log("Initial directory: %s" % universe.startdir, 1)
     log("Command line: %s" % " ".join(sys.argv), 1)
-    if universe.debug_mode():
-        log("WARNING: Unsafe debugging mode is enabled!", 6)
 
     # pass the initialized universe back
     return universe