diff options
| author | Yehuda Sadeh <yehuda@hq.newdream.net> | 2012-03-12 21:15:50 +0100 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@hq.newdream.net> | 2012-03-12 21:21:22 +0100 |
| commit | 2c88f85c6d9ce62277abc3f66e44a3fc16ebc4e2 (patch) | |
| tree | 66982373998673b491db8884a3bd09e664e35d72 /src/rgw | |
| parent | qa: use recent kernel for kernel_untar_build.sh (diff) | |
| download | ceph-2c88f85c6d9ce62277abc3f66e44a3fc16ebc4e2.tar.xz ceph-2c88f85c6d9ce62277abc3f66e44a3fc16ebc4e2.zip | |
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/rgw')
| -rw-r--r-- | src/rgw/rgw_admin.cc | 2 | ||||
| -rw-r--r-- | src/rgw/rgw_main.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 1d9629b371b..0c37ce88588 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -506,7 +506,7 @@ int main(int argc, char **argv) argv_to_vec(argc, (const char **)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); common_init_finish(g_ceph_context); std::string user_id, access_key, secret_key, user_email, display_name; diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 1d16cfb1acf..9729355bbea 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -340,7 +340,7 @@ int main(int argc, const char **argv) vector<const char*> args; argv_to_vec(argc, argv, args); env_to_vec(args); - global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, + global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS); pid_t childpid = 0; |