summaryrefslogtreecommitdiff
path: root/src/ceph_osd.cc
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@hq.newdream.net>2012-03-12 13:15:50 -0700
committerYehuda Sadeh <yehuda@hq.newdream.net>2012-03-12 13:21:22 -0700
commit2c88f85c6d9ce62277abc3f66e44a3fc16ebc4e2 (patch)
tree66982373998673b491db8884a3bd09e664e35d72 /src/ceph_osd.cc
parent968d29d1380a88ffe08879e7d5f8076a228a6734 (diff)
downloadceph-2c88f85c6d9ce62277abc3f66e44a3fc16ebc4e2.tar.gz
config: alternative config options for global_init()
We want to be able to provide alternative default config values, than the ones we set in common/config_opts.h. This can be useful when we want different default for different modules (e.g., rgw, rgw-admin). Just passing it on the command line won't do because then we'd override any config set by the user, so we need to process that before the regular parsing (but after initializing the config context). Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Diffstat (limited to 'src/ceph_osd.cc')
-rw-r--r--src/ceph_osd.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index e883e6016de..7177b32fd2f 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -67,7 +67,7 @@ int main(int argc, const char **argv)
argv_to_vec(argc, argv, args);
env_to_vec(args);
- global_init(args, CEPH_ENTITY_TYPE_OSD, CODE_ENVIRONMENT_DAEMON, 0);
+ global_init(NULL, args, CEPH_ENTITY_TYPE_OSD, CODE_ENVIRONMENT_DAEMON, 0);
ceph_heap_profiler_init();
// osd specific args