common/config: export CEPH_CONF_FILE_DEFAULT

idryomov · idryomov · commit 57a8c535ccad · 2024-08-18T21:34:09.000+02:00
It used to be exported until commit 318c62f ("common/config: cleanup remove some unused macros"). Having CEPH_CONF_FILE_DEFAULT avaialable is handy to prevent parse_config_files() from picking up CEPH_CONF environment variable. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
diff --git a/src/common/config.cc b/src/common/config.cc
@@ -55,7 +55,7 @@ using ceph::decode;
 using ceph::encode;
 using ceph::Formatter;
 
-static const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config,/etc/ceph/$cluster.conf,$home/.ceph/$cluster.conf,$cluster.conf"
+const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config,/etc/ceph/$cluster.conf,$home/.ceph/$cluster.conf,$cluster.conf"
 #if defined(__FreeBSD__)
     ",/usr/local/etc/ceph/$cluster.conf"
 #elif defined(_WIN32)
diff --git a/src/common/config.h b/src/common/config.h
@@ -39,6 +39,8 @@ enum {
 
 extern const char *ceph_conf_level_name(int level);
 
+extern const char *CEPH_CONF_FILE_DEFAULT;
+
 /** This class represents the current Ceph configuration.
  *
  * For Ceph daemons, this is the daemon configuration.  Log levels, caching

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ enum {`
`39`	`39`
`40`	`40`	`extern const char *ceph_conf_level_name(int level);`
`41`	`41`
	`42`	`+extern const char *CEPH_CONF_FILE_DEFAULT;`
	`43`	`+`
`42`	`44`	`/** This class represents the current Ceph configuration.`
`43`	`45`	`*`
`44`	`46`	`* For Ceph daemons, this is the daemon configuration. Log levels, caching`