Merge pull request #759 from ccztux/issue-757

Fixed some configuration directives doesnt work, e.g. all_partitions and follow_symlinks (#757)

CHANGES.rst

@@ -11,6 +11,7 @@ Changelog
 - Fixed connection to NRDP server can hang indefinitely (#776) (ccztux)
 - Fixed toggle long output doesnt work (#778) (ccztux)
 - Fixed the filter Type gets lost on pages > 1 (#780) (ccztux)
+- Fixed some configuration directives doesnt work, e.g. all_partitions and follow_symlinks (#757) (ccztux)
 - Fixed issue with systemctl not showing services due to output (#791)
 
 2.3.1 - 02/11/2021

VERSION

@@ -1 +1 @@
-2.4.0
+2.4.0

agent/listener/database.py

@@ -46,7 +46,7 @@ def setup(self):
 
     def run_db_maintenance(self, config):
         try:
-            days = int(config.get('general', 'check_logging_time'))
+            days = config.getint('general', 'check_logging_time')
         except Exception as e:
             days = 30;
         timestamp = time.time() - (days * 86400)

agent/listener/pluginnodes.py

@@ -84,13 +84,13 @@ def execute_plugin(self, config, *args, **kwargs):
 
         # Get plugin command timeout value, if it exists
         try:
-            timeout = int(config.get('plugin directives', 'plugin_timeout'))
+            timeout = config.getint('plugin directives', 'plugin_timeout')
         except Exception as e:
             timeout = 59
 
         # Get the check logging value
         try:
-            check_logging = int(config.get('general', 'check_logging'))
+            check_logging = config.getint('general', 'check_logging')
         except Exception as e:
             check_logging = 1
 
@@ -197,7 +197,7 @@ def setup_plugin_children(self, config):
 
         # Get the follow_symlinks value
         try:
-            follow_symlinks = bool(config.get('plugin directives', 'follow_symlinks'))
+            follow_symlinks = config.getboolean('plugin directives', 'follow_symlinks')
         except Exception as e:
             follow_symlinks = False
 

agent/listener/psapi.py

@@ -195,7 +195,7 @@ def get_disk_node(config):
 
     # Get the all partitions value
     try:
-        all_partitions = bool(config.get('general', 'all_partitions'))
+        all_partitions = config.getboolean('general', 'all_partitions')
     except Exception as e:
         all_partitions = True
 

agent/ncpa_windows.py

@@ -84,8 +84,8 @@ def setup_logging(self, *args, **kwargs):
         logging.getLogger().handlers = []
 
         # Max size of log files will be 20MB, and we'll keep one of them as backup
-        max_log_size_bytes = int(config.get('logmaxmb', 5))
-        max_log_rollovers = int(config.get('logbackups', 5))
+        max_log_size_bytes = config.getint('logmaxmb', 5)
+        max_log_rollovers = config.getint('logbackups', 5)
         max_file_size = max_log_size_bytes * 1024 * 1024
         file_handler = logging.handlers.RotatingFileHandler(log_file,
                                                             maxBytes=max_file_size,

agent/passive/nagioshandler.py

@@ -45,7 +45,7 @@ def get_commands_from_config(self):
                     duration = values[2]
                 else:
                     try:
-                        duration = int(self.config.get('passive', 'sleep'))
+                        duration = self.config.getint('passive', 'sleep')
                     except Exception:
                         duration = 300