By default don't exit singleuser immediately on critical.

Author: seisatsu

README.md

@@ -22,4 +22,4 @@ To run a multi-player server, you can run `server.py`, which will start a websoc
 Windows Releases
 ================
 
-The Windows releases contain binaries which already contain all of the requirements for running the server and cli. You shouldn't need to install anything. You also don't need to copy or rename the config files if you download a windows release.
+The Windows releases contain binaries which already contain all of the requirements for running the server and cli. You shouldn't need to install anything. You also don't need to copy or rename the config files if you download a Windows release.

database.py

@@ -87,6 +87,8 @@ def _startup(self):
         # Check if a lockfile exists for this database. If so, then fail.
         if os.path.exists(self._filename + ".lock"):
             self._log.critical("Lockfile exists for database: {filename}", filename=self._filename)
+            self._log.critical(
+                "If you are sure the database isn't in use, delete this file: {filename}.lock", filename=self._filename)
             return None
 
         # See if we can access the database file. If not, then fail.

docs/index.rst

@@ -6,6 +6,8 @@
 Dennis MUD User Manual
 ======================
 
+This documentation is unfinished.
+
 .. toctree::
    :maxdepth: 2
    :caption: Contents:

server.py

@@ -49,7 +49,7 @@
     textFileLogObserver, FilteringLogObserver, globalLogBeginner
 
 
-VERSION = "Alpha-0.0.1"
+VERSION = "Alpha-0.0.1a"
 
 
 class Router:

singleuser.config.example.json

@@ -4,7 +4,8 @@
   },
   "log": {
     "file": "dennis.singleuser.log",
-    "level": "debug"
+    "level": "debug",
+    "wait_on_critical": true
   },
   "prompt": {
     "history": "singleuser.history.txt"

singleuser.py

@@ -45,7 +45,7 @@
 from prompt_toolkit.history import FileHistory
 
 
-VERSION = "Alpha-0.0.1"
+VERSION = "Alpha-0.0.1a"
 
 
 class Router:
@@ -77,14 +77,16 @@ class Log:
     Logs to STDOUT, and optionally to a file.
     Filters out unwanted messages using a log level setting.
     """
-    def __init__(self, loglevel, logfile):
+    def __init__(self, loglevel, logfile, waitoncritical):
         """Single User Mode Log Initializer
 
-        :param loglevel: The log level to use. One of "debug", "info", "warn", "error", "critical", in descending verbosity.
+        :param loglevel: The log level to use. One of: debug, info, warn, error, critical, in descending verbosity.
         :param logfile: The open file to log to.
+        :param waitoncritical: Whether to wait for the enter key before exiting on a critical error. Nice for Windows.
         """
         self._loglevel = loglevel
         self._logfile = logfile
+        self._waitoncritical = waitoncritical
 
     def debug(self, msg, **kwargs):
         """Write a debug level message to the console and/or the log file.
@@ -127,6 +129,10 @@ def critical(self, msg, **kwargs):
         if self._logfile:
             self._logfile.write("[singleuser#critical] " + msg.format(**kwargs) + "\n")
 
+        # Be nice to Windows users who ran the program by double-clicking. :)
+        if self._waitoncritical:
+            input("Press Enter Key to Continue...")
+
     def write(self, msg):
         """Write an untagged message to the console and/or the log file, regardless of log level.
         """
@@ -146,26 +152,29 @@ def main():
         with open("singleuser.config.json") as f:
             config = json.load(f)
     except:
-        print("[singleuser#critical] could not open singleuser.config.json")
+        print("[singleuser#critical] Could not open singleuser config file: singleuser.config.json")
         return 2
 
     # Try to open the log file for writing, if one is set.
     # Otherwise don't use one.
+    if config["log"]["level"] in ["debug", "info"]:
+        print("[singleuser#info] Initializing logger...")
     logfile = None
     if config["log"]["file"]:
         try:
             logfile = open(config["log"]["file"], 'a')
         except:
             if config["log"]["level"] in ["debug", "info", "warn"]:
                 print("[singleuser#warn] Could not open singleuser log file: {0}".format(config["log"]["file"]))
-    log = Log(config["log"]["level"], logfile)
+    log = Log(config["log"]["level"], logfile, config["log"]["wait_on_critical"])
+    log.info("Finished initializing logger.")
 
     # Initialize the database manager, and create the "database" alias for use in Debug Mode.
-    log.info("initializing database manager")
+    log.info("Initializing database manager...")
     dbman = _database.DatabaseManager(config["database"]["filename"], log)
     if not dbman._startup():
         return 3
-    log.info("finished initializing database manager")
+    log.info("Finished initializing database manager.")
     database = dbman
 
     # Initialize the router.