diff options
author | Yehuda Sadeh <yehuda@hq.newdream.net> | 2012-03-12 13:15:50 -0700 |
---|---|---|
committer | Yehuda Sadeh <yehuda@hq.newdream.net> | 2012-03-12 13:21:22 -0700 |
commit | 2c88f85c6d9ce62277abc3f66e44a3fc16ebc4e2 (patch) | |
tree | 66982373998673b491db8884a3bd09e664e35d72 /src/ceph_conf.cc | |
parent | 968d29d1380a88ffe08879e7d5f8076a228a6734 (diff) | |
download | ceph-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_conf.cc')
-rw-r--r-- | src/ceph_conf.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ceph_conf.cc b/src/ceph_conf.cc index 1228b42765f..608c0852122 100644 --- a/src/ceph_conf.cc +++ b/src/ceph_conf.cc @@ -156,7 +156,7 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); env_to_vec(args); - global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); // do not common_init_finish(); do not start threads; do not do any of thing // wonky things the daemon whose conf we are examining would do (like initialize |