rgw: fix log

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index de0c3201db03cf783d9fba18969c79167274a564..ec62487d5ebea342138d016ca2eca71c23d66808 100644 (file)
--- 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 40e2f205c3990891789103632945d87a063da595..8728277a111d6d683f4a8aa83b178b247338ef36 100644 (file)
--- 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<string, string>::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<string, string>::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 f21fae99bb2e6d370d16565b264b02c5a160b245..d6ab2be6235fcf7dc8208ae606aae7eaf989cce6 100644 (file)
--- 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;