From 6716ed0d07692150a23b83da64530d3da1b8d519 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 29 May 2023 20:08:22 +0200
Subject: [PATCH] Continued: - introduced error_log table and corresponding
 log_error() function - added error_log_cleanup for cleaning up old records
 (default: 7 days)

---
 blocks_empty.db      | Bin 28672 -> 32768 bytes
 config.defaults.json |   3 ++-
 fba.py               |  33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/blocks_empty.db b/blocks_empty.db
index d71854123e51723ffba2036f461511f2699b2a55..1854e2ec34f86c7f766076dd243a424f0d3854e2 100644
GIT binary patch
delta 491
zcmZp8z}V2hG(lSMD+2=q2N1)6#Y7!r>8}iW-V=HGni<%+lo<Ht^1kEV#PyqNI+qgv
z)Xjndn>Z%xaDJ027G)PVmS=2K%*;zkt;kHNh|kO`E=kNwPMy4tUyC2ciBHMTP0Y-j
z+{iCl4`C{CItDv)X(oxVi|YdQv%>YK78T_eLDfUpIr-@v&Oxq@A+8FZelD&N3Q8b*
zkku(E`1>g+!Bs0MXmD{VLG9tvY%~#O7nhf3Y%(uNOv<TGg{y-z*rCRUI6C>b;xdRc
z#M3V_#5E#B!OtIvLw$U7fVM!)NX}15RpRvY3vqRK4Z<Ryn_66)m=07D;;MyaKyp!P
zVo7QWrfx3H&6~I{GO_TxGDuBy6q`JkZv_i5f&wNs`bcGpv5V^igG~?~Y_O1?9Llf3
Q0q4~4D=rcUSY)680Qy;!)c^nh

delta 172
zcmZo@U}|{4I6+$Q3j+fKI}|elX`_ic#*$wc^t>nX@-;KCa&Kbbo6Gx-dlUa$epgPN
z&4L13I40|Ge%m;qfl+|3naKyJ1r9cE;=ahl0^~|fbQGIBmv4nYm=K$|tUP0VW?o8a
zMP^FH<n{a-lOOOa2qp@$iz~`AHuA$|Y`C;0=W}T+5(t<Wz|G1EG=&*x+k1XS1_0D(
BDjxs<

diff --git a/config.defaults.json b/config.defaults.json
index 9ab743b..59d37ae 100644
--- a/config.defaults.json
+++ b/config.defaults.json
@@ -13,5 +13,6 @@
     "slogan"            : "### Your footer slogan ###",
     "recheck_instance"  : 43200,
     "recheck_block"     : 43200,
-    "misskey_offset"    : 100
+    "misskey_offset"    : 100,
+    "error_log_cleanup" : 604800
 }
diff --git a/fba.py b/fba.py
index 3c62ba7..733809a 100644
--- a/fba.py
+++ b/fba.py
@@ -370,6 +370,37 @@ def update_nodeinfos(domain: str):
 
     # DEBUG: print("DEBUG: EXIT!")
 
+def log_error(domain: str, res: any):
+    # DEBUG: print("DEBUG: domain,res[]:", domain, type(res))
+    try:
+        # DEBUG: print("DEBUG: BEFORE res[]:", type(res))
+        if isinstance(res, BaseException) or isinstance(res, json.JSONDecodeError):
+            res = str(res)
+
+        # DEBUG: print("DEBUG: AFTER res[]:", type(res))
+        if type(res) is str:
+            cursor.execute("INSERT INTO error_log (domain, error_code, error_message, created) VALUES (?, 999, ?, ?)",[
+                domain,
+                res,
+                time.time()
+            ])
+        else:
+            cursor.execute("INSERT INTO error_log (domain, error_code, error_message, created) VALUES (?, ?, ?, ?)",[
+                domain,
+                res.status_code,
+                res.reason,
+                time.time()
+            ])
+
+        # Cleanup old entries
+        # DEBUG: print(f"DEBUG: Purging old records (distance: {config['error_log_cleanup'])")
+        cursor.execute("DELETE FROM error_log WHERE created < ?", [time.time() - config["error_log_cleanup"]])
+    except BaseException as e:
+        print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(e)}]:'{str(e)}'")
+        sys.exit(255)
+
+    # DEBUG: print("DEBUG: EXIT!")
+
 def update_last_error(domain: str, res: any):
     # DEBUG: print("DEBUG: domain,res[]:", domain, type(res))
     try:
@@ -398,6 +429,8 @@ def update_last_error(domain: str, res: any):
             # DEBUG: print("DEBUG: Did not update any rows:", domain)
             pending_errors[domain] = res
 
+        log_error(domain, res)
+
     except BaseException as e:
         print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(e)}]:'{str(e)}'")
         sys.exit(255)
-- 
2.39.5