Removed Pholus Dependency in DBCLNP #681

front/plugins/db_cleanup/config.json

@@ -39,11 +39,6 @@
       "name"  : "hourstokeepnewdevice",
       "type"  : "setting",
       "value" : "HRS_TO_KEEP_NEWDEV"
-    },
-    {
-      "name"  : "pholuskeepdays",
-      "type"  : "setting",
-      "value" : "PHOLUS_DAYS_DATA"
     }
   ],  
 

front/plugins/db_cleanup/script.py

@@ -39,7 +39,7 @@ def main():
     PLUGINS_KEEP_HIST       = int(values.pluginskeephistory.split('=')[1])
     HRS_TO_KEEP_NEWDEV      = int(values.hourstokeepnewdevice.split('=')[1])
     DAYS_TO_KEEP_EVENTS     = int(values.daystokeepevents.split('=')[1])
-    PHOLUS_DAYS_DATA      = int(values.pholuskeepdays.split('=')[1])
+    PHOLUS_DAYS_DATA        = get_setting_value("PHOLUS_DAYS_DATA")
 
     mylog('verbose', [f'[{pluginName}] In script'])     
 
@@ -148,7 +148,7 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
 
     # -----------------------------------------------------
     # Cleanup Pholus_Scan
-    if PHOLUS_DAYS_DATA != 0:
+    if PHOLUS_DAYS_DATA != "" and PHOLUS_DAYS_DATA != 0:
         mylog('verbose', [f'[{pluginName}] Pholus_Scan: Delete all older than ' + str(PHOLUS_DAYS_DATA) + ' days (PHOLUS_DAYS_DATA setting)'])
         # todo: improvement possibility: keep at least N per mac
         cursor.execute (f"""DELETE FROM Pholus_Scan 

front/plugins/pholus_scan/config.json

@@ -205,7 +205,7 @@
       "name": [
         {
           "language_code": "en_us",
-          "string": "Schedule"
+          "string": "Retention of data"
         },
         {
           "language_code": "es_es",

server/plugin.py

@@ -21,6 +21,8 @@ from notification import Notification_obj
 class plugin_param:
     def __init__(self, param, plugin, db):
 
+        mylog('debug', f'[Plugins] Resolving param: {param}')
+
         paramValuesCount = 1
 
         #  Get setting value