Continued:

- moved --same from nodeinfo.sh to command update_nodeinfo()

diff --git a/fba/boot.py b/fba/boot.py
index f0a109b6cf3a07115009fef6b7d29648584d5555..d87ef4d0075dfc03910a693f66ff86994c3ca739 100644 (file)
--- a/fba/boot.py
+++ b/fba/boot.py
@@ -230,6 +230,7 @@ def init_parser():
     parser.add_argument("--no-auto", action="store_true", help="Checks only entries with other than AUTO_DISCOVERY as detection mode.")
     parser.add_argument("--no-detection", action="store_true", help="Checks only entries with no detection mode set.")
     parser.add_argument("--with-software", action="store_true", help="Checks only entries with any software type detected.")
+    parser.add_argument("--same", action="store_true", help="Checks only entries with domain and software being the same.")
 
     ### Fetch instances from instances.social ###
     parser = subparser_command.add_parser(

diff --git a/fba/commands.py b/fba/commands.py
index 66c36c6f4178bb9066053c1275ffca4634402897..91e998d40b97aef30d26e46ff19b20aa95c64b7e 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -203,10 +203,10 @@ def fetch_bkali(args: argparse.Namespace) -> int:
 
         logger.debug("fetched[]='%s'", type(fetched))
         if "error_message" in fetched:
-            logger.warning("post_json_api() for 'gql.sources.bka.li' returned error message='%s", fetched["error_message"])
+            logger.warning("post_json_api() for 'gql.sources.bka.li' returned error message='%s' - EXIT!", fetched["error_message"])
             return 100
         elif isinstance(fetched["json"], dict) and "error" in fetched["json"] and "message" in fetched["json"]["error"]:
-            logger.warning("post_json_api() returned error: '%s", fetched["error"]["message"])
+            logger.warning("post_json_api() returned error: '%s' - EXIT!", fetched["error"]["message"])
             return 101
 
         rows = fetched["json"]
@@ -1532,6 +1532,9 @@ def update_nodeinfo(args: argparse.Namespace) -> int:
     elif args.no_detection:
         logger.info("Fetching domains with no detection mode being set ...")
         database.cursor.execute("SELECT domain, software FROM instances WHERE detection_mode IS NULL ORDER BY last_updated ASC")
+    elif args.same:
+        logger.info("Fetching domains with domain name and software being the same ...")
+        database.cursor.execute("SELECT domain, software FROM instances WHERE domain=software ORDER BY last_updated ASC")
     else:
         logger.info("Fetching domains for recently updated ...")
         database.cursor.execute("SELECT domain, software FROM instances ORDER BY last_updated ASC")

diff --git a/nodeinfo.sh b/nodeinfo.sh
index f286f0577f9ffd451df797e4355336626da4a722..2ba294481e231ca6fe31c07c70c89837883072df 100755 (executable)
--- a/nodeinfo.sh
+++ b/nodeinfo.sh
@@ -28,10 +28,6 @@ elif [ "$1" = "--generator" ]
 then
        DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode='GENERATOR' ORDER BY last_updated ASC;")
        MODE="generator"
-elif [ "$1" = "--same" ]
-then
-       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE domain=software ORDER BY last_updated ASC;")
-       MODE="same"
 else
        DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
 fi