Made log_to_file default to true. Updated default data dir for webui.py when not running in docker.

Author: mrusse

config.ini

@@ -51,7 +51,7 @@ format = [%(levelname)s|%(module)s|L%(lineno)d] %(asctime)s: %(message)s
 # https://docs.python.org/3/library/time.html#time.strftime
 datefmt = %Y-%m-%dT%H:%M:%S%z
 # Enable logging to a file in addition to stdout
-log_to_file = False
+log_to_file = True
 # Log filename (resolved relative to the data/var directory)
 log_file = soularr.log
 # Maximum log file size in bytes before rotation (default: 1MB)

soularr.py

@@ -1040,7 +1040,7 @@ def setup_logging(config, var_dir):
 
     logging.basicConfig(level=level, format=fmt, datefmt=datefmt)
 
-    log_to_file = config.getboolean("Logging", "log_to_file", fallback=False)
+    log_to_file = config.getboolean("Logging", "log_to_file", fallback=True)
     if log_to_file:
         log_filename = config.get("Logging", "log_file", fallback="soularr.log")
         log_file_path = os.path.join(var_dir, log_filename)

webui/webui.py

@@ -33,7 +33,8 @@ def _fmt(msg, level="INFO"):
 
 def get_var_dir():
     parser = argparse.ArgumentParser(add_help=False)
-    parser.add_argument("--var-dir", default="/data")
+    default = "/data" if os.environ.get("IN_DOCKER") else os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    parser.add_argument("--var-dir", default=default)
     args, _ = parser.parse_known_args()
     return args.var_dir
 
@@ -96,7 +97,13 @@ def stream():
 
     def generate():
         while not os.path.exists(log_path):
-            yield f"data: {_fmt(f'Waiting for log file: {log_path}')}\n\n"
+            config = configparser.ConfigParser()
+            config.read(get_config_path(get_var_dir()))
+            log_to_file = config.getboolean("Logging", "log_to_file", fallback=False)
+            if not log_to_file:
+                yield f"data: {_fmt('Log file not found. Make sure log_to_file = True is set in your config.ini')}\n\n"
+            else:
+                yield f"data: {_fmt(f'Waiting for log file: {log_path}')}\n\n"
             time.sleep(5)
         with open(log_path, "r") as f:
             for line in f:
@@ -120,7 +127,8 @@ def generate():
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Soularr Web UI")
-    parser.add_argument("--var-dir", default="/data", help="Directory containing config.ini and soularr.log")
+    default = "/data" if os.environ.get("IN_DOCKER") else os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    parser.add_argument("--var-dir", default=default, help="Directory containing config.ini and soularr.log")
     parser.add_argument("--port", type=int, default=8265, help="Port to listen on (default: 8265)")
     parser.add_argument("--host", default="0.0.0.0", help="Host to bind to (default: 0.0.0.0)")
     args = parser.parse_args()