diff options
| -rw-r--r-- | shaping/include/shaper_swarmkv.h | 3 | ||||
| -rw-r--r-- | shaping/src/main.cpp | 4 | ||||
| -rw-r--r-- | shaping/src/shaper_swarmkv.cpp | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/shaping/include/shaper_swarmkv.h b/shaping/include/shaper_swarmkv.h index 0a82acd..8ccfe19 100644 --- a/shaping/include/shaper_swarmkv.h +++ b/shaping/include/shaper_swarmkv.h @@ -1,3 +1,4 @@ struct swarmkv* shaper_swarmkv_init(); -void shaper_swarmkv_destroy(struct swarmkv* swarmkv_db);
\ No newline at end of file +void shaper_swarmkv_destroy(struct swarmkv* swarmkv_db); +void swarmkv_reload_log_level();
\ No newline at end of file diff --git a/shaping/src/main.cpp b/shaping/src/main.cpp index 881476b..b526ff7 100644 --- a/shaping/src/main.cpp +++ b/shaping/src/main.cpp @@ -11,6 +11,7 @@ #include "shaper_stat.h" #include "shaper_marsio.h" #include "shaper_session.h" +#include "shaper_swarmkv.h" #include "shaper_global_stat.h" static int quit = 0; @@ -38,8 +39,9 @@ static void sig_handler(int signo) { if (signo == SIGHUP) { - LOG_INFO("%s: recv SIGHUP, reload zlog.conf", LOG_TAG_SHAPING); + LOG_INFO("%s: recv SIGHUP, reload zlog.conf and swarmkv log level", LOG_TAG_SHAPING); LOG_RELOAD(); + swarmkv_reload_log_level(); } if (signo == SIGQUIT) { diff --git a/shaping/src/shaper_swarmkv.cpp b/shaping/src/shaper_swarmkv.cpp index c0cfb6a..6d2e32f 100644 --- a/shaping/src/shaper_swarmkv.cpp +++ b/shaping/src/shaper_swarmkv.cpp @@ -17,6 +17,7 @@ struct shaper_swarmkv_conf short swarmkv_cluster_announce_port; short swarmkv_health_check_port; short swarmkv_health_check_announce_port; + short swarmkv_log_level; }; static int shaper_swarmkv_config_load(struct shaper_swarmkv_conf *conf) @@ -81,9 +82,21 @@ static int shaper_swarmkv_config_load(struct shaper_swarmkv_conf *conf) return ret; } + MESA_load_profile_short_def(SHAPING_GLOBAL_CONF_FILE, "SWARMKV", "SWARMKV_LOG_LEVEL", &conf->swarmkv_log_level, 4); + return 0; } +void swarmkv_reload_log_level() +{ +#if 0 //TODO: need interface to reload log level + short log_level = 0; + + MESA_load_profile_short_def(SHAPING_GLOBAL_CONF_FILE, "SWARMKV", "SWARMKV_LOG_LEVEL", &log_level, 4); +#endif + return; +} + struct swarmkv* shaper_swarmkv_init() { struct swarmkv_options *swarmkv_opts = NULL; @@ -106,7 +119,7 @@ struct swarmkv* shaper_swarmkv_init() swarmkv_options_set_health_check_port(swarmkv_opts, conf.swarmkv_health_check_port); swarmkv_options_set_health_check_announce_port(swarmkv_opts, conf.swarmkv_health_check_announce_port); swarmkv_options_set_log_path(swarmkv_opts, "log"); - swarmkv_options_set_log_level(swarmkv_opts, 4); + swarmkv_options_set_log_level(swarmkv_opts, conf.swarmkv_log_level); swarmkv_db = swarmkv_open(swarmkv_opts, conf.swarmkv_cluster_name, &err); if (err) { |