logging: Make logger and log format configurable through cli

Change-Id: Ic4b701a6621578848ff67ae4ecb5a10b5f32f93b
BUG: 1075611
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/7372
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

9 files changed, 259 insertions, 6 deletions

diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 9c9fad96ecd..531932619bf 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -110,6 +110,11 @@ static struct argp_option gf_options[] = {
         {"log-file", ARGP_LOG_FILE_KEY, "LOGFILE", 0,
          "File to use for logging [default: "
          DEFAULT_LOG_FILE_DIRECTORY "/" PACKAGE_NAME ".log" "]"},
+        {"logger", ARGP_LOGGER, "LOGGER", 0, "Set which logging sub-system to "
+        "log to, valid options are: gluster-log and syslog, "
+        "[default: \"gluster-log\"]"},
+        {"log-format", ARGP_LOG_FORMAT, "LOG-FORMAT", 0, "Set log format, valid"
+         " options are: no-msg-id and with-msg-id, [default: \"with-msg-id\"]"},
 
         {0, 0, 0, 0, "Advanced Options:"},
         {"volfile-server-port", ARGP_VOLFILE_SERVER_PORT_KEY, "PORT", 0,
@@ -1084,6 +1089,27 @@ parse_opts (int key, char *arg, struct argp_state *state)
                               "unknown use-readdirp setting \"%s\"", arg);
                 break;
 
+        case ARGP_LOGGER:
+                if (strcasecmp (arg, GF_LOGGER_GLUSTER_LOG) == 0)
+                        cmd_args->logger = gf_logger_glusterlog;
+                else if (strcasecmp (arg, GF_LOGGER_SYSLOG) == 0)
+                        cmd_args->logger = gf_logger_syslog;
+                else
+                        argp_failure (state, -1, 0, "unknown logger %s", arg);
+
+                break;
+
+        case ARGP_LOG_FORMAT:
+                if (strcasecmp (arg, GF_LOG_FORMAT_NO_MSG_ID) == 0)
+                        cmd_args->log_format = gf_logformat_traditional;
+                else if (strcasecmp (arg, GF_LOG_FORMAT_WITH_MSG_ID) == 0)
+                        cmd_args->log_format = gf_logformat_withmsgid;
+                else
+                        argp_failure (state, -1, 0, "unknown log format %s",
+                                      arg);
+
+                break;
+
 	}
 
         return 0;
@@ -1297,6 +1323,8 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
 
         /* parsing command line arguments */
         cmd_args->log_level = DEFAULT_LOG_LEVEL;
+        cmd_args->logger    = gf_logger_glusterlog;
+        cmd_args->log_format = gf_logformat_withmsgid;
 
         cmd_args->mac_compat = GF_OPTION_DISABLE;
 #ifdef GF_DARWIN_HOST_OS
@@ -1365,6 +1393,10 @@ logging_init (glusterfs_ctx_t *ctx, const char *progpath)
         /* finish log set parameters before init */
         gf_log_set_loglevel (cmd_args->log_level);
 
+        gf_log_set_logger (cmd_args->logger);
+
+        gf_log_set_logformat (cmd_args->log_format);
+
         if (gf_log_init (ctx, cmd_args->log_file, cmd_args->log_ident) == -1) {
                 fprintf (stderr, "ERROR: failed to open logfile %s\n",
                          cmd_args->log_file);
diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h
index ad4c3699b56..24487b4d461 100644
--- a/glusterfsd/src/glusterfsd.h
+++ b/glusterfsd/src/glusterfsd.h
@@ -85,6 +85,8 @@ enum argp_option_keys {
         ARGP_FUSE_USE_READDIRP_KEY        = 165,
 	ARGP_AUX_GFID_MOUNT_KEY		  = 166,
         ARGP_FUSE_NO_ROOT_SQUASH_KEY      = 167,
+        ARGP_LOGGER                       = 168,
+        ARGP_LOG_FORMAT                   = 169,
 };
 
 struct _gfd_vol_top_priv_t {
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 1ccb27d164c..bfc2fc6ade3 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -3048,3 +3048,38 @@ dht_is_linkfile (struct iatt *buf, dict_t *dict)
         return linkfile_key_found;
 }
 
+int
+gf_check_log_format (const char *value)
+{
+        int log_format = -1;
+
+        if (!strcasecmp (value, GF_LOG_FORMAT_NO_MSG_ID))
+                log_format = gf_logformat_traditional;
+        else if (!strcasecmp (value, GF_LOG_FORMAT_WITH_MSG_ID))
+                log_format = gf_logformat_withmsgid;
+
+        if (log_format == -1)
+                gf_log (THIS->name, GF_LOG_ERROR, "Invalid log-format. "
+                        "possible values are "
+                        GF_LOG_FORMAT_NO_MSG_ID "|" GF_LOG_FORMAT_WITH_MSG_ID);
+
+        return log_format;
+}
+
+int
+gf_check_logger (const char *value)
+{
+        int logger = -1;
+
+        if (!strcasecmp (value, GF_LOGGER_GLUSTER_LOG))
+                logger = gf_logger_glusterlog;
+        else if (!strcasecmp (value, GF_LOGGER_SYSLOG))
+                logger = gf_logger_syslog;
+
+        if (logger == -1)
+                gf_log (THIS->name, GF_LOG_ERROR, "Invalid logger. "
+                        "possible values are "
+                        GF_LOGGER_GLUSTER_LOG "|" GF_LOGGER_SYSLOG);
+
+        return logger;
+}
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
index ee4e5b7e6ee..26dcd314742 100644
--- a/libglusterfs/src/common-utils.h
+++ b/libglusterfs/src/common-utils.h
@@ -629,4 +629,10 @@ struct _dict;
 inline gf_boolean_t
 dht_is_linkfile (struct iatt *buf, struct _dict *dict);
 
+int
+gf_check_log_format (const char *value);
+
+int
+gf_check_logger (const char *value);
+
 #endif /* _COMMON_UTILS_H */
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h
index 6a8e38a2182..c419308f9b5 100644
--- a/libglusterfs/src/glusterfs.h
+++ b/libglusterfs/src/glusterfs.h
@@ -346,6 +346,8 @@ struct _cmd_args {
         gf_loglevel_t    log_level;
         char            *log_file;
         char            *log_ident;
+        gf_log_logger_t  logger;
+        gf_log_format_t  log_format;
         int32_t          max_connect_attempts;
         /* advanced options */
         uint32_t         volfile_server_port;
diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h
index b6b13fbd02a..210602c3210 100644
--- a/libglusterfs/src/logging.h
+++ b/libglusterfs/src/logging.h
@@ -48,6 +48,12 @@
 #define LOG_DEBUG   7           /* debug-level messages */
 #endif
 
+#define GF_LOG_FORMAT_NO_MSG_ID       "no-msg-id"
+#define GF_LOG_FORMAT_WITH_MSG_ID     "with-msg-id"
+
+#define GF_LOGGER_GLUSTER_LOG         "gluster-log"
+#define GF_LOGGER_SYSLOG              "syslog"
+
 typedef enum {
         GF_LOG_NONE,
         GF_LOG_EMERG,
@@ -254,6 +260,12 @@ void set_sys_log_level (gf_loglevel_t level);
 
 int gf_log_fini(void *data);
 
+void
+gf_log_set_logger (gf_log_logger_t logger);
+
+void
+gf_log_set_logformat (gf_log_format_t format);
+
 #define GF_DEBUG(xl, format, args...)                           \
         gf_log ((xl)->name, GF_LOG_DEBUG, format, ##args)
 #define GF_INFO(xl, format, args...)                            \
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index 9e48a7c6eca..d63fbb26c4f 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -2666,9 +2666,13 @@ reconfigure (xlator_t *this, dict_t *options)
         struct ios_conf    *conf = NULL;
         int                 ret = -1;
         char               *sys_log_str = NULL;
+        char               *log_format_str = NULL;
+        char               *logger_str    = NULL;
         int                 sys_log_level = -1;
         char               *log_str = NULL;
         int                 log_level = -1;
+        int                 log_format = -1;
+        int                 logger = -1;
 
         if (!this || !this->private)
                 goto out;
@@ -2696,6 +2700,18 @@ reconfigure (xlator_t *this, dict_t *options)
                 gf_log_set_loglevel (log_level);
         }
 
+        GF_OPTION_RECONF ("logger", logger_str, options, str, out);
+        if (logger_str) {
+                logger = gf_check_logger (logger_str);
+                gf_log_set_logger (logger);
+        }
+
+        GF_OPTION_RECONF ("log-format", log_format_str, options, str, out);
+        if (log_format_str) {
+                log_format = gf_check_log_format (log_format_str);
+                gf_log_set_logformat (log_format);
+        }
+
         ret = 0;
 out:
         gf_log (this->name, GF_LOG_DEBUG, "reconfigure returning %d", ret);
@@ -2727,6 +2743,10 @@ init (xlator_t *this)
 {
         struct ios_conf    *conf = NULL;
         char               *sys_log_str = NULL;
+        char               *logger_str  = NULL;
+        char               *log_format_str  = NULL;
+        int                 logger = -1;
+        int                 log_format = -1;
         int                 sys_log_level = -1;
         char               *log_str = NULL;
         int                 log_level = -1;
@@ -2785,6 +2805,19 @@ init (xlator_t *this)
                 gf_log_set_loglevel (log_level);
         }
 
+        GF_OPTION_INIT ("logger", logger_str, str, out);
+        if (logger_str) {
+                logger = gf_check_logger (logger_str);
+                gf_log_set_logger (logger);
+        }
+
+        GF_OPTION_INIT ("log-format", log_format_str, str, out);
+        if (log_format_str) {
+                log_format = gf_check_log_format (log_format_str);
+                gf_log_set_logformat (log_format);
+        }
+
+
         this->private = conf;
         ret = 0;
 out:
@@ -3027,6 +3060,40 @@ struct volume_options options[] = {
           .value = { "DEBUG", "WARNING", "ERROR", "INFO",
                      "CRITICAL", "NONE", "TRACE"}
         },
+        { .key = {"logger"},
+          .type = GF_OPTION_TYPE_STR,
+          .value = { GF_LOGGER_GLUSTER_LOG, GF_LOGGER_SYSLOG}
+        },
+        { .key = {"client-logger"},
+          .type = GF_OPTION_TYPE_STR,
+          .default_value = GF_LOGGER_GLUSTER_LOG,
+          .description = "Changes the logging sub-system to log to, for the "
+                         "clients",
+          .value = { GF_LOGGER_GLUSTER_LOG, GF_LOGGER_SYSLOG}
+        },
+        { .key = {"brick-logger"},
+          .type = GF_OPTION_TYPE_STR,
+          .default_value = GF_LOGGER_GLUSTER_LOG,
+          .description = "Changes the logging sub-system to log to, for the "
+                         "bricks",
+          .value = { GF_LOGGER_GLUSTER_LOG, GF_LOGGER_SYSLOG}
+        },
+        { .key = {"log-format"},
+          .type = GF_OPTION_TYPE_STR,
+          .value = { GF_LOG_FORMAT_NO_MSG_ID, GF_LOG_FORMAT_WITH_MSG_ID}
+        },
+        { .key = {"client-log-format"},
+          .type = GF_OPTION_TYPE_STR,
+          .default_value = GF_LOG_FORMAT_WITH_MSG_ID,
+          .description = "Changes log format for the clients",
+          .value = { GF_LOG_FORMAT_NO_MSG_ID, GF_LOG_FORMAT_WITH_MSG_ID}
+        },
+        { .key = {"brick-log-format"},
+          .type = GF_OPTION_TYPE_STR,
+          .default_value = GF_LOG_FORMAT_WITH_MSG_ID,
+          .description = "Changes the log format for the bricks",
+          .value = { GF_LOG_FORMAT_NO_MSG_ID, GF_LOG_FORMAT_WITH_MSG_ID}
+        },
         { .key  = {NULL} },
 
 };
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 78395827937..0b3a8d09961 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -1328,6 +1328,44 @@ sys_loglevel_option_handler (volgen_graph_t *graph,
 }
 
 static int
+logger_option_handler (volgen_graph_t *graph, struct volopt_map_entry *vme,
+                       void *param)
+{
+        char  *role = NULL;
+        struct volopt_map_entry vme2 = {0,};
+
+        role = (char *) param;
+
+        if (strcmp (vme->option, "!logger") != 0 ||
+            !strstr (vme->key, role))
+                return 0;
+
+        memcpy (&vme2, vme, sizeof (vme2));
+        vme2.option = "logger";
+
+        return basic_option_handler (graph, &vme2, NULL);
+}
+
+static int
+log_format_option_handler (volgen_graph_t *graph, struct volopt_map_entry *vme,
+                           void *param)
+{
+        char  *role = NULL;
+        struct volopt_map_entry vme2 = {0,};
+
+        role = (char *) param;
+
+        if (strcmp (vme->option, "!log-format") != 0 ||
+            !strstr (vme->key, role))
+                return 0;
+
+        memcpy (&vme2, vme, sizeof (vme2));
+        vme2.option = "log-format";
+
+        return basic_option_handler (graph, &vme2, NULL);
+}
+
+static int
 volgen_graph_set_xl_options (volgen_graph_t *graph, dict_t *dict)
 {
         int32_t   ret               = -1;
@@ -1379,6 +1417,12 @@ server_spec_option_handler (volgen_graph_t *graph,
         if (!ret)
                 ret = sys_loglevel_option_handler (graph, vme, "brick");
 
+        if (!ret)
+                ret = logger_option_handler (graph, vme, "brick");
+
+        if (!ret)
+                ret = log_format_option_handler (graph, vme, "brick");
+
         return ret;
 }
 
@@ -2536,7 +2580,9 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
         char            *tmp     = NULL;
         gf_boolean_t     var     = _gf_false;
         gf_boolean_t     ob      = _gf_false;
+        xlator_t        *this    = THIS;
 
+        GF_ASSERT (this);
         GF_ASSERT (conf);
 
         volname = volinfo->volname;
@@ -2613,7 +2659,7 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
                         ob = _gf_false;
                         ret = gf_string2boolean (tmp, &ob);
                         if (!ret && ob) {
-                                gf_log (THIS->name, GF_LOG_WARNING,
+                                gf_log (this->name, GF_LOG_WARNING,
                                         "root-squash is enabled. Please turn it"
                                         " off to change read-after-open "
                                         "option");
@@ -2682,7 +2728,7 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
                                 ret = 0;
                 }
                 if (ret) {
-                        gf_log (THIS->name, GF_LOG_WARNING, "setting "
+                        gf_log (this->name, GF_LOG_WARNING, "setting "
                                 "open behind option as part of root "
                                 "squash failed");
                         goto out;
@@ -2708,14 +2754,28 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
                                                 &loglevel_option_handler);
 
         if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING, "changing client log level"
+                gf_log (this->name, GF_LOG_WARNING, "changing client log level"
                         " failed");
 
         ret = volgen_graph_set_options_generic (graph, set_dict, "client",
                                                 &sys_loglevel_option_handler);
         if (ret)
-                gf_log (THIS->name, GF_LOG_WARNING, "changing client syslog "
+                gf_log (this->name, GF_LOG_WARNING, "changing client syslog "
                         "level failed");
+
+        ret = volgen_graph_set_options_generic (graph, set_dict, "client",
+                                                &logger_option_handler);
+
+        if (ret)
+                gf_log (this->name, GF_LOG_WARNING, "changing client logger"
+                        " failed");
+
+        ret = volgen_graph_set_options_generic (graph, set_dict, "client",
+                                                &log_format_option_handler);
+        if (ret)
+                gf_log (this->name, GF_LOG_WARNING, "changing client log format"
+                        " failed");
+
 out:
         return ret;
 }
@@ -3052,16 +3112,31 @@ build_shd_graph (volgen_graph_t *graph, dict_t *mod_dict)
                                                  &loglevel_option_handler);
 
                 if (ret)
-                        gf_log (THIS->name, GF_LOG_WARNING, "changing loglevel "
+                        gf_log (this->name, GF_LOG_WARNING, "changing loglevel "
                                 "of self-heal daemon failed");
 
                 ret = volgen_graph_set_options_generic (graph, set_dict,
                                                         "client",
                                                  &sys_loglevel_option_handler);
                 if (ret)
-                        gf_log (THIS->name, GF_LOG_WARNING, "changing syslog "
+                        gf_log (this->name, GF_LOG_WARNING, "changing syslog "
                                 "level of self-heal daemon failed");
 
+                ret = volgen_graph_set_options_generic (graph, set_dict,
+                                                        "client",
+                                                 &logger_option_handler);
+
+                if (ret)
+                        gf_log (this->name, GF_LOG_WARNING, "changing logger "
+                                "of self-heal daemon failed");
+
+                ret = volgen_graph_set_options_generic (graph, set_dict,
+                                                        "client",
+                                                 &log_format_option_handler);
+                if (ret)
+                        gf_log (this->name, GF_LOG_WARNING, "changing log "
+                                "format level of self-heal daemon failed");
+
                 ret = dict_reset (set_dict);
                 if (ret)
                         goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 7f094c43974..29e9f2b877c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -610,6 +610,28 @@ struct volopt_map_entry glusterd_volopt_map[] = {
           .op_version = 1,
           .flags      = OPT_FLAG_CLIENT_OPT
         },
+        { .key         = "diagnostics.brick-logger",
+          .voltype     = "debug/io-stats",
+          .option      = "!logger",
+          .op_version  = 4
+        },
+        { .key        = "diagnostics.client-logger",
+          .voltype    = "debug/io-stats",
+          .option     = "!logger",
+          .op_version = 4,
+          .flags      = OPT_FLAG_CLIENT_OPT
+        },
+        { .key         = "diagnostics.brick-log-format",
+          .voltype     = "debug/io-stats",
+          .option      = "!log-format",
+          .op_version  = 4
+        },
+        { .key        = "diagnostics.client-log-format",
+          .voltype    = "debug/io-stats",
+          .option     = "!log-format",
+          .op_version = 4,
+          .flags      = OPT_FLAG_CLIENT_OPT
+        },
 
         /* IO-cache xlator options */
         { .key         = "performance.cache-max-file-size",