Grotti 3.5.0: Pagination, Logging, Deb-Paket, Makro-Doku, PLA-Match-Fix.

server.py

@@ -7,10 +7,12 @@ import time
 
 from waitress import serve
 
-from grotti import db, jobs, library, store
+from grotti import db, jobs, library, logutil, store
 from grotti.config import load
 from web.app import create_app
 
+log = logutil.get("grotti.server")
+
 
 def background(cfg):
     def work():
@@ -20,10 +22,10 @@ def background(cfg):
                 jobs.sync_history(conn, cfg)
                 deleted = db.prune_run_samples(conn, keep_days=90)
                 if deleted:
-                    print("Proben gelöscht: %s" % deleted, flush=True)
+                    log.info("Proben gelöscht: %s", deleted)
                 conn.commit()
         except Exception as exc:
-            print("Abgleich: %s" % exc, flush=True)
+            log.warning("Abgleich: %s", exc)
 
     threading.Thread(target=work, name="grotti-abgleich", daemon=True).start()
 
@@ -39,14 +41,15 @@ def _retention_loop(cfg, stop_event):
                 n = db.prune_run_samples(conn, keep_days=90)
                 conn.commit()
                 if n:
-                    print("Retention: %s Proben gelöscht." % n, flush=True)
+                    log.info("Retention: %s Proben gelöscht.", n)
         except Exception as exc:
-            print("Retention: %s" % exc, flush=True)
+            log.warning("Retention: %s", exc)
         stop_event.wait(3600)
 
 
 def main():
     cfg = load()
+    logutil.setup(cfg.get("log_level") or "INFO")
     cfg["data_dir"].mkdir(parents=True, exist_ok=True)
     (cfg["data_dir"] / "eingang").mkdir(exist_ok=True)
     db.prepare(cfg["database_url"])
@@ -107,7 +110,7 @@ def main():
         except (ValueError, OSError):
             pass
 
-    print("Grotti: http://%s:%s/" % (cfg["host"], cfg["port"]), flush=True)
+    log.info("Grotti: http://%s:%s/", cfg["host"], cfg["port"])
     serve(app, host=cfg["host"], port=cfg["port"], threads=16, channel_timeout=120)