ldap/servers/slapd/daemon.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 024abeec69c9914116ad2ae880e75a884cbd18ff
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Jul 22 15:36:49 2013 -0400
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!)
(cherry picked from commit c0887894fc2c13524d6dfd1cd56d9d54924d03a0)
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 5a1705d..62c263e 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -602,14 +602,6 @@ disk_mon_get_dirs(char ***list, int logs_critical){
char *cookie = 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 */
#ifdef LOCALSTATEDIR
disk_mon_add_dir(list, LOCALSTATEDIR);
@@ -620,6 +612,9 @@ disk_mon_get_dirs(char ***list, int logs_critical){
/* config and backend directories */
CFG_LOCK_READ(config);
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);
be = slapi_get_first_backend (&cookie);