diff options
| author | Vijay Bellur <vbellur@redhat.com> | 2013-09-13 11:11:41 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-09-24 12:00:35 -0700 |
| commit | 848471799236063961eb37cb7bda3cf0e9a6f956 (patch) | |
| tree | b2486f5befea051def27d037d1e0ed86c28c1bb0 | |
| parent | 711484d759cedbd77e449d306f7e31d596e6ae0d (diff) | |
logging: Remove multiple definitions of DEFAULT_LOG_FILE_DIRECTORY
Change-Id: I8d670a228d3c1282aa7d70b151f166d04abc40e5
BUG: 764890
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: http://review.gluster.org/5909
Reviewed-by: Anand Avati <avati@redhat.com>
Tested-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | cli/src/cli.h | 3 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.h | 2 | ||||
| -rw-r--r-- | libglusterfs/src/logging.h | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cli/src/cli.h b/cli/src/cli.h index 36f3c13be8e..5a491eba7a4 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -18,6 +18,7 @@ #include "rpc-clnt.h" #include "glusterfs.h" #include "protocol-common.h" +#include "logging.h" #include "cli1-xdr.h" @@ -32,8 +33,6 @@ #define CLI_DEFAULT_CMD_TIMEOUT 120 #define CLI_TEN_MINUTES_TIMEOUT 600 //Longer timeout for volume top #define DEFAULT_CLI_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" -#define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" -#define DEFAULT_VAR_RUN_DIRECTORY DATADIR "/run/gluster" #define CLI_VOL_STATUS_BRICK_LEN 55 #define CLI_TAB_LENGTH 8 #define CLI_BRICK_STATUS_LINE_LEN 78 diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index 06b4aacc833..9e2a0e56e6f 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -20,8 +20,6 @@ #define DEFAULT_GLUSTERD_VOLFILE CONFDIR "/glusterd.vol" #define DEFAULT_CLIENT_VOLFILE CONFDIR "/glusterfs.vol" #define DEFAULT_SERVER_VOLFILE CONFDIR "/glusterfsd.vol" -#define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" -#define DEFAULT_LOG_LEVEL GF_LOG_INFO #define DEFAULT_EVENT_POOL_SIZE 16384 diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h index 9da1379e7ca..cc806a76712 100644 --- a/libglusterfs/src/logging.h +++ b/libglusterfs/src/logging.h @@ -35,6 +35,7 @@ #define GF_PRI_BLKSIZE PRId32 #define GF_PRI_SIZET "zu" + #if 0 /* Syslog definitions :-) */ #define LOG_EMERG 0 /* system is unusable */ @@ -60,6 +61,9 @@ typedef enum { GF_LOG_TRACE, /* full trace of operation */ } gf_loglevel_t; +#define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" +#define DEFAULT_LOG_LEVEL GF_LOG_INFO + typedef struct gf_log_handle_ { pthread_mutex_t logfile_mutex; uint8_t logrotate; diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index e3ff9ec8d6d..26e9b0c0dbf 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -40,7 +40,6 @@ #include "store.h" #define GLUSTERD_MAX_VOLUME_NAME 1000 -#define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" #define GLUSTERD_TR_LOG_SIZE 50 #define GLUSTERD_NAME "glusterd" #define GLUSTERD_SOCKET_LISTEN_BACKLOG 128 |