RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

common/common_init: set conf->host in common_preinit()

Browse Source 
conf.host is used by graylog for setting the "host" property.
and it is used when serving the "get config" command when the command
queries the "host", so better off setting it early before
flushing the log entries with graylog.

Fixes: https://tracker.ceph.com/issues/45457
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-07-05 12:00:24 +08:00
parent 45be641769
commit 3bee326025
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/common_init.cc
View File

@ -19,6 +19,7 @@
#include "common/ceph_context.h"
#include "common/config.h"
#include "common/dout.h"
#include "common/hostname.h"
#include "common/strtol.h"
#include "common/valgrind.h"
#include "common/zipkin_trace.h"
@ -66,6 +67,9 @@ CephContext *common_preinit(const CephInitParameters &iparams,
conf.set_val("no_config_file", iparams.no_config_file ? "true" : "false");
if (conf->host.empty()) {
conf.set_val("host", ceph_get_short_hostname());
}
return cct;
}
#endif // #ifndef WITH_SEASTAR