Browse Source

Ticket 47441 - Disk Monitoring not checking filesystem with logs

Bug Description:  If logging is not set to critical, then the log directories
                  are not checked for available diskspace.

Fix Description:  Remove the "logging_critical" check, and always include the
                  log directories.

https://fedorahosted.org/389/ticket/47441

Reviewed by: richm(Thanks!)
Mark Reynolds 12 years ago
parent
commit
c0887894fc
1 changed files with 3 additions and 8 deletions
  1. 3 8
      ldap/servers/slapd/daemon.c

+ 3 - 8
ldap/servers/slapd/daemon.c

@@ -602,14 +602,6 @@ disk_mon_get_dirs(char ***list, int logs_critical){
     char *cookie = NULL;
     char *cookie = NULL;
     char *dir = NULL;
     char *dir = NULL;
 
 
-    if(logs_critical){
-        CFG_LOCK_READ(config);
-        disk_mon_add_dir(list, config->accesslog);
-        disk_mon_add_dir(list, config->errorlog);
-        disk_mon_add_dir(list, config->auditlog);
-        CFG_UNLOCK_READ(config);
-    }
-
     /* Add /var just to be safe */
     /* Add /var just to be safe */
 #ifdef LOCALSTATEDIR
 #ifdef LOCALSTATEDIR
     disk_mon_add_dir(list, LOCALSTATEDIR);
     disk_mon_add_dir(list, LOCALSTATEDIR);
@@ -620,6 +612,9 @@ disk_mon_get_dirs(char ***list, int logs_critical){
     /* config and backend directories */
     /* config and backend directories */
     CFG_LOCK_READ(config);
     CFG_LOCK_READ(config);
     disk_mon_add_dir(list, config->configdir);
     disk_mon_add_dir(list, config->configdir);
+    disk_mon_add_dir(list, config->accesslog);
+    disk_mon_add_dir(list, config->errorlog);
+    disk_mon_add_dir(list, config->auditlog);
     CFG_UNLOCK_READ(config);
     CFG_UNLOCK_READ(config);
 
 
     be = slapi_get_first_backend (&cookie);
     be = slapi_get_first_backend (&cookie);