Continued:

- added commented out debug lines

diff --git a/fba/helpers/cache.py b/fba/helpers/cache.py
index ecdb3fc203f16f080f8be1e7f7fd2c3557610adc..8299d28b49da4c90c12980007393d95f85cd84bc 100644 (file)
--- a/fba/helpers/cache.py
+++ b/fba/helpers/cache.py
@@ -17,13 +17,12 @@
 import logging
 import sqlite3
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 # Cache for redundant SQL queries
 _cache = {}
 
-##### Cache #####
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def key_exists(key: str) -> bool:
     logger.debug("key='%s' - CALLED!", key)

diff --git a/fba/helpers/config.py b/fba/helpers/config.py
index 091b53a0e165ae0a7aac3fb1c66e8b9f78abc233..5f6f0aa99306ea985be4e9ce4fdfb4c759aba69f 100644 (file)
--- a/fba/helpers/config.py
+++ b/fba/helpers/config.py
@@ -18,13 +18,14 @@ import logging
 import json
 import sys
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 # Private configration array, DO NOT access this directly. Please invoke
 # config.get("foo") instead
 _config = {}
 
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
+
 with open("config.json") as f:
     logger.debug("Loading configuration file ...")
     _config = json.loads(f.read())

diff --git a/fba/helpers/cookies.py b/fba/helpers/cookies.py
index b23e644a38802ad51b4281dce8a4ea89db4b84e0..edfbd188fee5b256a27ee83519f143d182653f1e 100644 (file)
--- a/fba/helpers/cookies.py
+++ b/fba/helpers/cookies.py
@@ -19,12 +19,13 @@ import logging
 from fba.helpers import blacklist
 from fba.helpers import domain as domain_helper
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 # Cookies storage
 _cookies = {}
 
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
+
 def store(domain: str, cookies: dict):
     logger.debug("domain='%s',cookies()=%d - CALLED!", domain, len(cookies))
     domain_helper.raise_on(domain)

diff --git a/fba/helpers/dicts.py b/fba/helpers/dicts.py
index cd9ccbde4ae4c5c8f436719423cbf2a032351f0f..7142b3fd5701d3ccbac5e3f635b01256af8b5537 100644 (file)
--- a/fba/helpers/dicts.py
+++ b/fba/helpers/dicts.py
@@ -17,6 +17,7 @@ import logging
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def has_key(lists: list, key: str, value: any) -> bool:
     logger.debug("lists()=%d,key='%s',value[]='%s' - CALLED!", len(lists), key, type(value))

diff --git a/fba/helpers/domain.py b/fba/helpers/domain.py
index 7d3ad0638c40f3d9d0065d6fd07c430c5fa4e096..224b590bdc686236c03e3fb7777f27544a3b8286 100644 (file)
--- a/fba/helpers/domain.py
+++ b/fba/helpers/domain.py
@@ -28,6 +28,7 @@ from fba.models import instances
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def raise_on(domain: str) -> None:
     logger.debug("domain='%s' - CALLED!", domain)

diff --git a/fba/helpers/json.py b/fba/helpers/json.py
index 6d0454c22875e59f6d219b4b7a854cb5ec7a4e00..b862d73ebd28da55ac7a5b185676f7e824f82b9f 100644 (file)
--- a/fba/helpers/json.py
+++ b/fba/helpers/json.py
@@ -21,6 +21,7 @@ import requests
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def is_json_response(response: requests.models.Response) -> bool:
     logger.debug("response[]='%s' - CALLED!", type(response))
@@ -46,7 +47,10 @@ def from_response(response: requests.models.Response) -> any:
         logger.warning("response.headers[content-type]='%s' is not a JSON type, below json() invocation may raise an exception", response.headers.get("content-type"))
 
     data = list()
-    if response.text.strip() != "":
+    raw  = response.text.strip()
+
+    logger.debug("raw()=%d", len(raw))
+    if raw != "":
         logger.debug("response.text()=%d is not empty, invoking response.json() ...", len(response.text))
         try:
             data = response.json()

diff --git a/fba/helpers/locking.py b/fba/helpers/locking.py
index c507f72b2539d8ab04e061e1c482a0a9fd30d349..809d15335f4567cf92f282e89476f669ac0f3bc5 100644 (file)
--- a/fba/helpers/locking.py
+++ b/fba/helpers/locking.py
@@ -20,13 +20,14 @@ import sys
 import tempfile
 import zc.lockfile
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 # Lock file
 lockfile = tempfile.gettempdir() + '/fba.lock'
 LOCK = None
 
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
+
 def acquire() -> None:
     global LOCK
     logger.debug("CALLED!")

diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py
index b1f9a8e912d3fbffc82ebe98b2417aeaaab5c14f..0bed7638ae4a086ca757a88957c3b533e58138eb 100644 (file)
--- a/fba/helpers/processing.py
+++ b/fba/helpers/processing.py
@@ -36,6 +36,7 @@ from fba.models import instances
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def instance(blocked: str, blocker: str, command: str, force: bool = False) -> bool:
     logger.debug("blocked='%s',blocker='%s',command='%s',force='%s' - CALLED!", blocked, blocker, command, force)

diff --git a/fba/helpers/software.py b/fba/helpers/software.py
index baac34c72a2762ad00195eb417e305deeeaaac66..d6577e9f569c6c340545bc6d2e9eb32352d0dc50 100644 (file)
--- a/fba/helpers/software.py
+++ b/fba/helpers/software.py
@@ -21,9 +21,6 @@ from functools import lru_cache
 from fba.helpers import tidyup
 from fba.helpers import version
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 # A list of relay software
 relays = [
     "activityrelay",
@@ -98,6 +95,10 @@ _pleroma_aliases = [
     "moon-eyed"
 ]
 
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
+
 @lru_cache
 def alias(software: str) -> str:
     logger.debug("software='%s'- CALLED!", software)

diff --git a/fba/helpers/tidyup.py b/fba/helpers/tidyup.py
index acd8bc655475bfc6cd4b472a0b0b1f53cd6edd54..a249926e95502e943aa7e979948951d489c7b3f3 100644 (file)
--- a/fba/helpers/tidyup.py
+++ b/fba/helpers/tidyup.py
@@ -18,6 +18,7 @@ import re
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def reason(string: str) -> str:
     logger.debug("string='%s' - CALLED!", string)

diff --git a/fba/helpers/version.py b/fba/helpers/version.py
index b6f7c6468463a1103ef120e6cda291ddf9ebd03f..3af545680a94d00582bf68a8d666b150faa88e21 100644 (file)
--- a/fba/helpers/version.py
+++ b/fba/helpers/version.py
@@ -18,11 +18,8 @@ import re
 
 from fba.helpers import software as software_helper
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 # Pattern instance for version numbers
-patterns = [
+_patterns = [
     # semantic version number (with v|V) prefix)
     re.compile(r"^(?P<version>v|V{0,1})(\.{0,1})(?P<major>0|[1-9]\d*)\.(?P<minor>0+|[1-9]\d*)(\.(?P<patch>0+|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)?$"),
     # non-sematic, e.g. 1.2.3.4
@@ -33,6 +30,10 @@ patterns = [
     re.compile("^[a-f0-9]{7}$"),
 ]
 
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
+
 def remove(software: str) -> str:
     logger.debug("software='%s' - CALLED!", software)
 
@@ -61,8 +62,8 @@ def remove(software: str) -> str:
         return software
 
     match = None
-    logger.debug("Checking %d patterns ...", len(patterns))
-    for pattern in patterns:
+    logger.debug("Checking %d patterns ...", len(_patterns))
+    for pattern in _patterns:
         # Run match()
         match = pattern.match(version)