diff options
author | John Spray <john.spray@redhat.com> | 2017-07-24 12:01:36 +0200 |
---|---|---|
committer | John Spray <john.spray@redhat.com> | 2017-07-24 15:03:59 +0200 |
commit | 4d06719f101f49019be25bd6137f72f2cb85bd5a (patch) | |
tree | 07c1042b7d9b0ca3d5c5a78806c22d00af48cdbb /src/common/ceph_context.h | |
parent | common/options: mark all obvious LEVEL_DEV options (diff) | |
download | ceph-4d06719f101f49019be25bd6137f72f2cb85bd5a.tar.xz ceph-4d06719f101f49019be25bd6137f72f2cb85bd5a.zip |
common: use code_environment_t for daemon-ness in config
...and reinstate the set_daemon_default versions of config options
in place of the special casing in common_init.
Signed-off-by: John Spray <john.spray@redhat.com>
Diffstat (limited to 'src/common/ceph_context.h')
-rw-r--r-- | src/common/ceph_context.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h index 64aec93f768..e024dba70f2 100644 --- a/src/common/ceph_context.h +++ b/src/common/ceph_context.h @@ -20,6 +20,7 @@ #include <boost/noncopyable.hpp> #include "common/cmdparse.h" +#include "common/code_environment.h" #include "crush/CrushLocation.h" #include "include/Spinlock.h" @@ -50,7 +51,9 @@ namespace ceph { */ class CephContext { public: - CephContext(uint32_t module_type_, int init_flags_ = 0); + CephContext(uint32_t module_type_, + enum code_environment_t code_env=CODE_ENVIRONMENT_UTILITY, + int init_flags_ = 0); // ref count! private: |