diff options
| author | Bala.FA <barumuga@redhat.com> | 2013-08-09 17:26:48 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-08-13 07:08:07 -0700 |
| commit | e3f2d5fb1e8a12317959748eee15d4ec1f8f3fa6 (patch) | |
| tree | d301da496fbfd7cbbe8f398b8a43a4d2088920cf | |
| parent | 4e63eafaed6073eab3d87c579e964fa5302f0d63 (diff) | |
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>
| -rw-r--r-- | doc/logging.txt | 4 | ||||
| -rw-r--r-- | libglusterfs/src/logging.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/logging.txt b/doc/logging.txt index e4a85758694..b4ee45996a5 100644 --- a/doc/logging.txt +++ b/doc/logging.txt @@ -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. diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c index abb6b05eb63..b92cc03d2e4 100644 --- a/libglusterfs/src/logging.c +++ b/libglusterfs/src/logging.c @@ -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 |