diff options
| author | Sage Weil <sage@redhat.com> | 2017-11-13 16:27:00 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2018-03-06 21:44:10 +0100 |
| commit | db655f800a7fcf50a1707b6708b592ff50f9663d (patch) | |
| tree | a14a89c4469ce902d113d4dc6fd5097d0fae55dd /src/ceph_fuse.cc | |
| parent | os/bluestore: pass rocksdb options via map, not global config (diff) | |
| download | ceph-db655f800a7fcf50a1707b6708b592ff50f9663d.tar.xz ceph-db655f800a7fcf50a1707b6708b592ff50f9663d.zip | |
common: refactor default config value handling
- pass an optional map<string,string> instead of an arg list
- remember default values in md_config_t
- some nicer helpers
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/ceph_fuse.cc')
| -rw-r--r-- | src/ceph_fuse.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc index 05a4f3f9da9..35e3509bf70 100644 --- a/src/ceph_fuse.cc +++ b/src/ceph_fuse.cc @@ -79,9 +79,11 @@ int main(int argc, const char **argv, const char *envp[]) { } env_to_vec(args); - std::vector<const char*> def_args{"--pid-file="}; + std::map<std::string,std::string> defaults = { + { "pid_file", "" } + }; - auto cct = global_init(&def_args, args, CEPH_ENTITY_TYPE_CLIENT, + auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS); |