db4e 0.44.2__tar.gz → 0.46.0__tar.gz

{db4e-0.44.2 → db4e-0.46.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: db4e
-Version: 0.44.2
+Version: 0.46.0
 Summary: A unified Monero XMR mining dashboard for deployment, operation and real-time analytics.
 License: GPL-3.0-or-later
 License-File: LICENSE

{db4e-0.44.2 → db4e-0.46.0}/db4e/Constants/DButton.py

@@ -18,11 +18,13 @@ class DButton(ConstGroup):
     ENABLE : str  = "enable_button"
     HASHRATE : str  = "hashrate_button"
     NEW : str  = "new_button"
+    PAYMENTS : str  = "payments_button"
     PROCEED : str  = "proceed_button"
     RESTART : str  = "restart_button"
-    SHARES_FOUND : str = "shares_found"
+    SHARES_FOUND : str = "shares_found_button"
     START : str  = "start_button"
     STOP : str  = "stop_button"
+    TABLES : str  = "tables_button"
     UPDATE : str  = "update_button"
     RUNTIME : str = "runtime_button"
     UPTIME : str = "uptime_button"

{db4e-0.44.2 → db4e-0.46.0}/db4e/Constants/DDef.py

@@ -37,7 +37,7 @@ class DDef(ConstGroup):
     DB4E_SERVICE_FILE : str = "db4e.service"
     DB4E_START_SCRIPT : str = "db4e-server"
     DB4E_UNINSTALL_SCRIPT : str = "db4e-uninstall-service.sh"
-    DB4E_VERSION : str = "0.44.2"
+    DB4E_VERSION : str = "0.46.0"
     DEPL_COLLECTION : str = "depl"
     DEV_DIR : str = "dev"
     DONATION_WALLET : str = "48aTDJfRH2JLcKW2fz4m9HJeLLVK5rMo1bKiNHFc43Ht2e2kPVh2tmk3Md7npz1WsSU7bpgtX2Xnf59RHCLUEaHfQHwao4j"

{db4e-0.44.2 → db4e-0.46.0}/db4e/Constants/DField.py

@@ -28,6 +28,7 @@ class DField(ConstGroup) :
     DB4E_DIR : str = "db4e_dir"
     DB4E_LOG_FILE : str = "db4e_log_file"
     DB4E_MAP : str = "db4es_map"
+    DB4E_PLOT : str = "db4e_plot"
     DEBUG : str = "debug"
     DEPLOYMENT : str = "deployment"
     DEPLOYMENT_TYPE : str = "depl_type"
@@ -61,6 +62,7 @@ class DField(ConstGroup) :
     JOB : str = "job"
     JOBS : str = "jobs"
     LABEL : str = "label"
+    LABELS : str = "labels"
     LEVEL : str = "level"
     LOCAL : str = "local"
     LOCAL_TIMESTAMP : str = "local_timestamp"
@@ -124,10 +126,12 @@ class DField(ConstGroup) :
     PYPI_REPO : str = "pypi_repo"
     PYTHON : str = "python"
     RADIO_MAP : str = "radio_map"
+    RC : str = "rc"
     REMOTE : str = "remote"
     RESET_DATA : str = "reset_data"
     RESULTS : str = "results"
     RETRY_TIMEOUT : str = "retry_timeout"
+    RIGHT : str = "right"
     RUN_BACKUP : str = "run_backup"
     RPC_BIND_PORT : str = "rpc_bind_port"
     RUNTIME_LOG : str = "runtime_log"
@@ -137,11 +141,14 @@ class DField(ConstGroup) :
     SET_PANE : str = "set_pane"
     SOCKET_FILE : str = "socket_file"
     START : str = "start"
+    START_STOP_LOG : str = "start_stop_log"
     STARTING : str = "starting"
     STATS_MOD : str = "stats_mod"
     STOP : str = "stop"
     STOPPING : str = "stopping"
     STDIN_PATH : str = "stdin_path"
+    STDOUT : str = "stdout"
+    STDERR : str = "stderr"
     STRATUM_PORT : str = "stratum_port"
     SOFTWARE_SYSTEM : str = "software_system"
     STARTED : str = "started"

{db4e-0.44.2 → db4e-0.46.0}/db4e/Constants/DFile.py

@@ -21,6 +21,8 @@ class DFile(ConstGroup):
     MONGODUMP : str = "mongodump"
     P2POOL_LOG : str = "p2pool.log"
     P2POOL_STDIN : str = "p2pool.stdin"
+    RM : str = "rm"
+    SCRIPT : str = "script"
     STATS_MOD : str = "stats_mod"
     SUDO : str = "sudo"
     SYSTEMCTL : str = "systemctl"

{db4e-0.44.2 → db4e-0.46.0}/db4e/Constants/DLabel.py

@@ -21,12 +21,13 @@ class DLabel(ConstGroup):
     API : str = "API"
     BLOCKCHAIN : str = "Blockchain"
     BLOCKCHAIN_DIR : str = "Blockchain Directory"
+    BLOCKS : str = "Blocks"
     BLOCKS_FOUND : str = "Blocks Found"
     CHAIN : str = "Chain"
     CHAIN_STATS : str = "Chain Stats"
     CONFIG : str = "Configuration"
     CONFIG_FILE : str = "Configuration File"
-    CURRENT_UPTIME : str = "Current Uptime"
+    CURRENT : str = "Current"
     DAYS : str = "Days"
     DB4E : str = "Db4E Core"
     DB4E_LONG : str = "Database 4 Everything"
@@ -94,6 +95,7 @@ class DLabel(ConstGroup):
     P2POOL_WATCHER : str = "P2Pool Watcher"
     PARENT : str = "Parent"
     PARENT_ID : str = "Parent ID"
+    PAYMENTS : str = "Payments"
     PLOT : str = "Plot"
     PRIMARY_SERVER : str = "Primary Server"
     PRIORITY_NODE_1 : str = "Priority Node 1"
@@ -111,14 +113,16 @@ class DLabel(ConstGroup):
     SHOW_TIME_STATS : str = "Show Time Stats"
     SOFTWARE_SYSTEM : str = "Software System"
     START : str = "Start"
+    START_STOP_LOG : str = "Start/Stop Log"
     STATUS : str = "Status"
     STARTUP_SCRIPT : str = "Startup Script"
     STATS_MOD : str = "API stats_mod"
     STDIN_PATH : str = "Standard Input FIFO"
     STOP : str = "Stop"
     STRATUM_PORT : str = "Stratum Port"
+    TABLES : str = "Tables"
     TIMESTAMP : str = "Timestamp"
-    TOTAL_UPTIME : str = "Total Uptime"
+    TOTAL : str = "Total"
     TUI_LOG : str = "Console Log"
     TYPE : str = "Type"
     UPDATE : str = "Update"

{db4e-0.44.2 → db4e-0.46.0}/db4e/Constants/DMethod.py

@@ -20,8 +20,11 @@ class DMethod(ConstGroup):
     DISABLE_DEPLOYMENT : str = "disable_deployment"
     GET_NEW : str = "get_new"
     GET_DEPL : str = "get_deployment"
+    GET_PAYMENTS : str = "get_payments"
     GET_TUI_LOG : str = "get_tui_log"
     GET_RUNTIME_LOG : str = "get_runtime_log"
+    GET_START_STOP_LOG : str = "get_start_stop_log"
+    GET_TABLE_DATA : str = "get_table_data"
     GET_UPTIME : str = "get_uptime"
     HASHRATES : str = "hashrates"
     INITIAL_SETUP : str = "initial_setup"
@@ -33,5 +36,6 @@ class DMethod(ConstGroup):
     SET_DONATIONS : str = "set_donations"
     SET_PANE : str = DField.SET_PANE
     SET_PRIMARY : str = "set_primary"
+    SHARES_FOUND : str = "shares_found"
     UPDATE_DEPLOYMENT : str = "update_deployment"
     RUNTIME : str = "runtime"

db4e-0.46.0/db4e/Constants/DPane.py

@@ -0,0 +1,40 @@
+"""
+db4e/Constants/DPanes.py
+
+    Database 4 Everything
+    Author: Nadim-Daniel Ghaznavi 
+    Copyright: (c) 2024-2025 Nadim-Daniel Ghaznavi
+    GitHub: https://github.com/NadimGhaznavi/db4e
+    License: GPL 3.0
+"""
+
+from db4e.Modules.ConstGroup import ConstGroup
+
+
+class DPane(ConstGroup):
+    CHAIN : str  = "ChainPane"
+    CHAIN_BLOCKS_FOUND  : str = "ChainBlocksFoundPane"
+    CHAIN_HASHRATES  : str = "ChainHashratesPane"
+    DB4E : str = "Db4EPane"
+    DONATIONS : str  = "DonationsPane"
+    INITIAL_SETUP : str  = "InitialSetupPane"
+    LOG_VIEW : str  = "LogViewPane"
+    MONEROD_TYPE : str  = "MoneroDTypePane"
+    MONEROD : str  = "MoneroDPane"
+    MONEROD_REMOTE : str  = "MoneroDRemotePane"
+    P2POOL_TYPE : str  = "P2PoolTypePane"
+    P2POOL : str  = "P2PoolPane"
+    P2POOL_ANALYTICS : str  = "P2PoolAnalyticsPane"
+    P2POOL_HASHRATES : str  = "P2PoolHashratesPane"
+    P2POOL_REMOTE : str  = "P2PoolRemotePane"
+    P2POOL_SHARES_FOUND : str  = "P2PoolSharesFoundPane"
+    P2POOL_TABLES : str = "P2PoolTablesPane"
+    PAYMENTS : str = "PaymentsPane"
+    RESULTS : str  = "ResultsPane"
+    RUNTIME_LOG : str  = "RuntimeLogPane"
+    TUI_LOG : str  = "TuiLogPane"
+    START_STOP_LOG : str  = "StartStopLogPane"
+    WELCOME : str  = "WelcomePane"
+    XMRIG : str  = "XMRigPane"
+    XMRIG_HASHRATES : str  = "XMRigHashratesPane"
+    XMRIG_REMOTE : str  = "XMRigRemotePane"

{db4e-0.44.2 → db4e-0.46.0}/db4e/Constants/DSelect.py

@@ -11,13 +11,21 @@ db4e/Constants/DSelect.py
 from db4e.Constants.DLabel import DLabel
 
 
-WEEKS_1 = 7 * 24
-WEEKS_2 = 14 * 24
-MONTHS_1 = 30 * 24
-MONTHS_3 = 30 * 24 * 3
-MONTHS_6 = 30 * 24 * 6
+WEEKS_1 = 7
+WEEKS_2 = 14
+MONTHS_1 = 30
+MONTHS_3 = 30 * 3
+MONTHS_6 = 30 * 6
 
 class DSelect:
+    HOURS_SELECT_LIST = [
+        (DLabel.WEEK_1, WEEKS_1 * 24),
+        (DLabel.WEEKS_2, WEEKS_2 * 24),
+        (DLabel.MONTH_1, MONTHS_1 * 24),
+        (DLabel.MONTHS_3, MONTHS_3 * 24),
+        (DLabel.MONTHS_6, MONTHS_6 * 24),
+        (DLabel.ALL_TIME, -1)    
+    ]
     SELECT_LIST = [
         (DLabel.WEEK_1, WEEKS_1),
         (DLabel.WEEKS_2, WEEKS_2),

{db4e-0.44.2 → db4e-0.46.0}/db4e/Db4E.tcss

@@ -326,7 +326,7 @@ Tree {
 Button {
     align: center middle;
     border: round #0c323e;
-    width: 20;
+    width: 15;
     background: black; }
 
 #abort_button {
@@ -361,6 +361,10 @@ Button {
     color: #5fc442;
     text-style: bold; }
 
+#payments_button {
+    color: #9a71c9ff;
+    text-style: bold; }
+
 #proceed_button {
     color: #5fc442;
     text-style: bold; }
@@ -370,7 +374,11 @@ Button {
     text-style: bold; }
 
 #runtime_button {
-    color: #9a71c9ff;
+    color: #4292c4ff;
+    text-style: bold; }
+
+#shares_found_button {
+    color: #4292c4ff;
     text-style: bold; }
 
 #start_button {
@@ -381,6 +389,10 @@ Button {
     color: #c44242;
     text-style: bold; }
 
+#tables_button {
+    color: #42c4a4ff;
+    text-style: bold; }    
+
 #update_button {
     color: #5fc442;
     text-style: bold; }
@@ -405,6 +417,12 @@ Button {
 .new #hashrate_button {
     display: none; }
 
+.new #shares_found_button {
+    display: none; }
+
+.new #tables_button {
+    display: none; }
+
 .new #update_button {
     display: none; }
 

{db4e-0.44.2 → db4e-0.46.0}/db4e/Modules/DbMgr.py

@@ -48,7 +48,6 @@ class DbMgr:
         self.mining_col    = DDef.MINING_COLLECTION
         self.depl_col      = DDef.DEPL_COLLECTION
         self.jobs_col      = DDef.JOBS_COLLECTION
-        self.log_col       = DDef.LOG_COLLECTION
         self.log_retention = DDef.LOG_RETENTION_DAYS
         self.ops_col       = DDef.OPS_COLLECTION
 
@@ -82,9 +81,7 @@ class DbMgr:
 
 
     def ensure_indexes(self):
-        log_col = self.get_collection(self.log_col)
-        if "timestamp_1" not in log_col.index_information():
-            log_col.create_index("timestamp")
+        pass
 
 
     @as_worker
@@ -135,9 +132,6 @@ class DbMgr:
             if aCol not in db_col_names:
                 try:
                     self.db4e.create_collection(aCol)
-                    if aCol == log_col:
-                        log_col = self.get_collection(log_col)
-                        log_col.create_index('timestamp')
                 except CollectionInvalid:
                     # TODO self.log.warning(f"Attempted to create existing collection: {aCol}")
                     pass

{db4e-0.44.2 → db4e-0.46.0}/db4e/Modules/DeplClient.py

@@ -84,6 +84,13 @@ class DeplClient:
         # Check for duplicate instance names and missing fields
         self.check_instance_and_fields(elem)
 
+        # Check for errors
+        if elem.status() != DStatus.GOOD and elem.status() != DStatus.UNKNOWN:
+            print(f"DeplClient:add_deployment(): Add failed: {elem.status()}")
+            for msg in elem.get_msgs():
+                print(f"DeplClient:add_deployment(): {msg}")
+            return elem
+
         class_map = {
             Db4E: DElem.DB4E,
             MoneroD: DElem.MONEROD,
@@ -95,6 +102,8 @@ class DeplClient:
 
         # Create an add job
         elem_type = class_map[type(elem)]
+
+        print(f"DeplClient:add_deployment(): Posting {DJob.NEW} job for {elem}")
         
         job = Job(op=DJob.NEW, instance=elem.instance(), elem_type=elem_type, elem=elem)
         self.job_queue.post_job(job)

{db4e-0.44.2 → db4e-0.46.0}/db4e/Modules/DeplMgr.py

@@ -13,7 +13,7 @@ from datetime import datetime
 from shutil import rmtree
 import socket
 from typing import overload
-import re
+import subprocess
 
 
 from db4e.Modules.DbCache import DbCache
@@ -28,7 +28,7 @@ from db4e.Modules.P2Pool import P2Pool
 from db4e.Modules.P2PoolRemote import P2PoolRemote
 from db4e.Modules.XMRig import XMRig
 from db4e.Modules.XMRigRemote import XMRigRemote
-from db4e.Modules.Helper import uptime_to_minutes
+from db4e.Modules.Helper import uptime_to_minutes, sudo_del_file
 
 from db4e.Constants.DField import DField
 from db4e.Constants.DLabel import DLabel
@@ -328,8 +328,7 @@ class DeplMgr:
             if os.path.exists(config):
                 os.remove(config)
             logrotate_config = elem.logrotate_config()
-            if os.path.exists(logrotate_config):
-                os.remove(logrotate_config)
+            sudo_del_file(logrotate_config)
             depl_dir = os.path.join(vendor_dir, DDir.P2POOL, elem.instance())
             if os.path.isdir(depl_dir):
                 rmtree(depl_dir)
@@ -338,8 +337,7 @@ class DeplMgr:
             if os.path.exists(config):
                 os.remove(config)
             logrotate_config = elem.logrotate_config()
-            if os.path.exists(logrotate_config):
-                os.remove(logrotate_config)
+            sudo_del_file(logrotate_config)
             depl_dir = os.path.join(vendor_dir, DElem.XMRIG, elem.instance())
             if os.path.isdir(depl_dir):
                 rmtree(depl_dir)
@@ -426,7 +424,7 @@ class DeplMgr:
             elif type(obj) == XMRig:
                 if obj.parent() != DField.DISABLE:
                     obj.p2pool = self.get_deployment_by_id(obj.parent())
-                    if obj.p2pool.parent() != DField.DISABLE:
+                    if type(obj.p2pool) == P2Pool and obj.p2pool.parent() != DField.DISABLE:
                         obj.p2pool.monerod = self.get_deployment_by_id(obj.p2pool.parent())
                 obj.instance_map = self.get_deployment_ids_and_instances(DElem.P2POOL)
             return obj
@@ -494,7 +492,7 @@ class DeplMgr:
         
         elif aDir == DDir.LOGROTATE:
             vendor_dir = self.get_dir(DDir.VENDOR)
-            return os.path.abspath(os.path.join(vendor_dir, DElem.DB4E, DDir.LOGROTATE))
+            return os.path.abspath(os.path.join(vendor_dir, DDir.LOGROTATE))
 
         elif aDir == DElem.MONEROD:
             return DElem.MONEROD + '-' + Default.MONEROD_VERSION
@@ -977,7 +975,7 @@ class DeplMgr:
         if p2pool.p2p_port != new_p2pool.p2p_port:
             msg = f"Updated P2P bind port: {p2pool.p2p_port()} > " \
                 f"{new_p2pool.p2p_port()}"
-            p2pool.p2p_bind_port(new_p2pool.p2p_port())
+            p2pool.p2p_port(new_p2pool.p2p_port())
             p2pool.msg(DLabel.P2POOL_SHORT, DStatus.GOOD, msg)
             update_config = True
             update = True

{db4e-0.44.2 → db4e-0.46.0}/db4e/Modules/HealthCache.py

@@ -97,7 +97,7 @@ class HealthCache:
                 return deepcopy(self.db4es_map[DField.INSTANCE][DField.INSTANCE])
             except KeyError:
                 print(f"HealthCache:check(): Db4E key error: {elem}")
-                return None
+                return elem
         
         # Monero
         elif type(elem) == MoneroD:
@@ -105,7 +105,7 @@ class HealthCache:
                 return deepcopy(self.monerods_map[elem.instance()][DField.INSTANCE])
             except KeyError:
                 print(f"HealthCache:check(): Monero key error: {elem}")
-                return None
+                return elem
 
         # Remote Monero
         elif type(elem) == MoneroDRemote:
@@ -120,7 +120,7 @@ class HealthCache:
                 return deepcopy(self.p2pools_map[elem.instance()][DField.INSTANCE])
             except KeyError:
                 print(f"HealthCache:check(): P2Pool key error: {elem}")
-                return None
+                return elem
 
         # Remote P2Pool
         elif type(elem) == P2PoolRemote:
@@ -128,7 +128,7 @@ class HealthCache:
                 return deepcopy(self.p2pools_remote_map[elem.instance()][DField.INSTANCE])
             except KeyError:
                 print(f"HealthCache:check(): Remote P2Pool key error: {elem}")
-                return None
+                return elem
 
         # Internal P2Pool
         elif type(elem) == InternalP2Pool:
@@ -136,7 +136,7 @@ class HealthCache:
                 return deepcopy(self.int_p2pools_map[elem.instance()][DField.INSTANCE])
             except KeyError:
                 print(f"HealthCache:check(): InternalP2Pool key error: {elem}")
-                return None
+                return elem
 
         # XMRig
         elif type(elem) == XMRig:
@@ -144,7 +144,7 @@ class HealthCache:
                 return deepcopy(self.xmrigs_map[elem.instance()][DField.INSTANCE])
             except KeyError:
                 print(f"HealthCache:check(): XMRig key error: {elem}")
-                return None
+                return elem
         
         # Remote XMRig
         elif type(elem) == XMRigRemote:
@@ -152,7 +152,7 @@ class HealthCache:
                 return deepcopy(self.xmrigs_remote_map[elem.instance()])
             except KeyError:
                 print(f"HealthCache:check(): XMRigRemote key error: {elem}")
-                return None
+                return elem
             
         else:
             raise ValueError(f"Unsupported element type: {type(elem)}")

{db4e-0.44.2 → db4e-0.46.0}/db4e/Modules/HealthMgr.py

@@ -29,6 +29,7 @@ from db4e.Constants.DField import DField
 class HealthMgr:
 
     def check(self, elem):
+        #print(f"HealthMgr:check(): {elem}")
         elem.pop_msgs()
         if type(elem) == Db4E:
             return self.check_db4e(elem)
@@ -335,6 +336,17 @@ class HealthMgr:
         if xmrig.parent() == DField.DISABLE:
             xmrig.msg(DLabel.P2POOL, DStatus.WARN,
                       f"Missing upstream P2pool deployment")
+        
+        # Check the health of the upstream P2Pool
+        self.check(xmrig.p2pool)
+        if xmrig.p2pool.status() == DStatus.GOOD:
+            xmrig.msg(DLabel.P2POOL, DStatus.GOOD,
+                      f"Upstream P2Pool ({xmrig.p2pool.instance()}) is healthy")
+        else:
+            xmrig.msg(DLabel.P2POOL, DStatus.WARN,
+                      f"Upstream P2Pool ({xmrig.p2pool.instance()}) has issues:")
+            xmrig.push_msgs(xmrig.p2pool.pop_msgs())
+
 
         return xmrig
 

{db4e-0.44.2 → db4e-0.46.0}/db4e/Modules/Helper.py

@@ -9,36 +9,20 @@ db4e/Modules/Helper.py
 
 Helper functions that are used in multiple modules   
 """
-import os, grp, getpass, re
+import os, grp, getpass, re, subprocess
 
 from rich import box
 from rich.table import Table
 
 from db4e.Constants.DStatus import DStatus
 from db4e.Constants.DField import DField
-from db4e.Constants.DLabel import DLabel
+from db4e.Constants.DFile import DFile
    
 
 
 error_color = "#935fcf"
 
 
-def del_config(config_file: str):
-    results = []
-    try:
-        os.remove(config_file)
-        results.append(result_row(
-            DLabel.XMRIG, DStatus.GOOD,
-            f"Removed old configration file: {config_file}"
-        ))
-    except OSError as e:
-        result_row.append(result_row(
-            DLabel.XMRIG, DStatus.WARN,
-            f"Unable to remove {config_file} {e} "
-        ))
-    return results
-
-
 def get_component_value(data, field_name):
     """
     Generic helper to get any component value by field name.
@@ -153,6 +137,32 @@ def set_component_value(rec, updates):
     return rec
 
 
+def sudo_del_file(aFile: str):
+    if not os.path.exists(aFile):
+        # Nothing to do
+        return
+    
+    cmd = [ DFile.SUDO, DFile.RM, "-f", aFile ]
+    try:
+        proc = subprocess.run(
+            cmd, 
+            stdout=subprocess.PIPE, 
+            stderr=subprocess.PIPE, 
+            input=''
+            )
+        return {
+            DField.STDOUT: proc.stdout.decode('utf-8'),
+            DField.STDERR: proc.stderr.decode('utf-8'),
+            DField.RC: proc.returncode
+        }
+    except Exception as e:
+        return {
+            DField.STDOUT: proc.stdout.decode('utf-8'),
+            DField.STDERR: proc.stderr.decode('utf-8'),
+            DField.RC: proc.returncode
+        } 
+
+
 def uptime_to_minutes(uptime_str: str):
     pattern = re.compile(r'(?:(\d+)d)?\s*(?:(\d+)h)?\s*(?:(\d+)m)?\s*(?:(\d+)s)?')
     match = pattern.fullmatch(uptime_str)

{db4e-0.44.2 → db4e-0.46.0}/db4e/Modules/InstallMgr.py

@@ -72,6 +72,11 @@ class InstallMgr(Container):
             self.db_cache.update_one(db4e)
             return db4e
         
+        # Create base vendor directories
+        vendor_dir = db4e.vendor_dir()
+        for aDir in [ DDef.BACKUP_DIR, DDef.LOG_ROTATE ]:
+            os.makedirs(os.path.join(vendor_dir, aDir))
+            db4e.msg(DLabel.VENDOR_DIR, DStatus.GOOD, f"Created directory: {aDir}")
 
         # We have everything we need to finish the install. Update the record.
         self.db_cache.update_one(db4e)
@@ -258,9 +263,10 @@ class InstallMgr(Container):
         os.makedirs(os.path.join(fq_db4e_dir))
         db4e.msg(DLabel.DB4E, DStatus.GOOD, f"Created directory: {fq_db4e_dir}")
         # Create the sub-directories
-        for sub_dir in [DDef.LOG_DIR, DDef.LOG_ROTATE, DDef.BACKUP_DIR ]:
+        for sub_dir in [DDef.LOG_DIR ]:
             os.mkdir(os.path.join(fq_db4e_dir, sub_dir))
             db4e.msg(DLabel.DB4E, DStatus.GOOD, f"Created directory: {fq_db4e_dir}/{sub_dir}")
+        db4e.msg(DLabel.DB4E, DStatus.GOOD, f"Created directory: {fq_db4e_dir}/{DDef.LOG_ROTATE}")
         return db4e
 
     def _create_monerod_dirs(self, db4e: Db4E) -> Db4E:
@@ -380,7 +386,7 @@ class InstallMgr(Container):
         logrotate_tmpl = self.depl_mgr.get_logrotate_template(DElem.DB4E)
         vendor_dir = db4e.vendor_dir()
         fq_config = os.path.join(
-            vendor_dir, DElem.DB4E, DDef.LOG_ROTATE, DElem.DB4E + DDef.CONF_SUFFIX)
+            vendor_dir, DDef.LOG_ROTATE, DElem.DB4E + DDef.CONF_SUFFIX)
         
         # Populate the config template
         placeholders = {