From 5d606c22bdb71ab6701451645961a26609e77255 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 14 Jul 2011 15:55:05 -0700 Subject: [PATCH] rgw: fix log --- src/rgw/rgw_common.h | 1 + src/rgw/rgw_env.cc | 12 +++++++++++- src/rgw/rgw_main.cc | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index de0c3201db03c..ec62487d5ebea 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -167,6 +167,7 @@ public: void reinit(char **envp); const char *get(const char *name, const char *def_val = NULL); int get_int(const char *name, int def_val = 0); + bool get_bool(const char *name, bool def_val = 0); size_t get_size(const char *name, size_t def_val = 0); }; diff --git a/src/rgw/rgw_env.cc b/src/rgw/rgw_env.cc index 40e2f205c3990..8728277a111d6 100644 --- a/src/rgw/rgw_env.cc +++ b/src/rgw/rgw_env.cc @@ -54,6 +54,16 @@ int RGWEnv::get_int(const char *name, int def_val) return atoi(s); } +bool RGWEnv::get_bool(const char *name, bool def_val) +{ + map::iterator iter = env_map.find(name); + if (iter == env_map.end()) + return def_val; + + const char *s = iter->second.c_str(); + return rgw_str_to_bool(s, def_val); +} + size_t RGWEnv::get_size(const char *name, size_t def_val) { map::iterator iter = env_map.find(name); @@ -68,5 +78,5 @@ void RGWConf::init(RGWEnv *env) { max_cache_lru = env->get_size("RGW_MAX_CACHE_LRU", 10000); log_level = env->get_int("RGW_LOG_LEVEL", g_conf->rgw_log); - should_log = env->get_int("RGW_SHOULD_LOG", RGW_SHOULD_LOG_DEFAULT); + should_log = env->get_bool("RGW_SHOULD_LOG", RGW_SHOULD_LOG_DEFAULT); } diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index f21fae99bb2e6..d6ab2be6235fc 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -94,7 +94,7 @@ int main(int argc, const char **argv) struct req_state *s = new req_state; - RGWOp *op; + RGWOp *op = NULL; int init_error = 0; RGWHandler *handler = rest.get_handler(s, &fcgx, &init_error); int ret; -- 2.39.5