log: use /etc/glusterfs/logger.conf file for logging target

This patch fixes to use /etc/glusterfs/logger.conf file instead of
/var/lib/glusterd/logger.conf for logging target (whether to use
syslog or not) at run time.

Change-Id: Icb1de9ebfb7e529940e2aac970978ad70b34b213
BUG: 928648
Signed-off-by: Bala.FA <barumuga@redhat.com>
Reviewed-on: http://review.gluster.org/5542
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
Bala.FA 2013-08-09 17:26:48 +05:30 committed by Vijay Bellur
parent 4e63eafaed
commit e3f2d5fb1e
2 changed files with 4 additions and 4 deletions

View File

@ -60,7 +60,7 @@ disabled by passing '--disable-syslog' to ./configure or '--without
syslog' to rpmbuild
Even though its enabled at compile time, its required to have
/var/lib/glusterd/logger.conf file to make it into effect before
starting gluster services
/etc/glusterfs/logger.conf file to make it into effect before starting
gluster services
Currently all gluster logs are sent with error code GF_ERR_DEV.

View File

@ -31,7 +31,7 @@
#define GF_JSON_MSG_LENGTH 8192
#define GF_SYSLOG_CEE_FORMAT \
"@cee: {\"msg\": \"%s\", \"gf_code\": \"%u\", \"gf_message\": \"%s\"}"
#define GF_LOG_CONTROL_FILE "/var/lib/glusterd/logger.conf"
#define GF_LOG_CONTROL_FILE "/etc/glusterfs/logger.conf"
#endif /* GF_USE_SYSLOG */
#include "xlator.h"
@ -130,7 +130,7 @@ gf_get_error_message (int error_code) {
/**
* gf_openlog -function to open syslog specific to gluster based on
* existent of file /var/lib/glusterd/logger.conf
* existence of file /etc/glusterfs/logger.conf
* @ident: optional identification string similar to openlog()
* @option: optional value to option to openlog(). Passing -1 uses
* 'LOG_PID | LOG_NDELAY' as default