diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 13:39:58 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 13:39:58 -0700 |
| commit | 5b2828dc2ac76e711d22c32957dcde9bc0b20e51 (patch) | |
| tree | c09e8f9baa63dc8222806796215f29d9e6dadbf8 | |
| parent | 893331be9eeb4263f23bedd5f8346b07129c78db (diff) | |
| parent | ef91c699616eaf5d82a451a7983bdee5158402c4 (diff) | |
| download | ceph-5b2828dc2ac76e711d22c32957dcde9bc0b20e51.tar.gz | |
Merge pull request #502 from ceph/wip-mon-log-level
mon: mon_cluster_log_file_level
Reviewed-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/common/config_opts.h | 1 | ||||
| -rw-r--r-- | src/mon/LogMonitor.cc | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h index d933250f282..52458c268c8 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -51,6 +51,7 @@ OPTION(mon_cluster_log_to_syslog, OPT_BOOL, false) OPTION(mon_cluster_log_to_syslog_level, OPT_STR, "info") // this level and above OPTION(mon_cluster_log_to_syslog_facility, OPT_STR, "daemon") OPTION(mon_cluster_log_file, OPT_STR, "/var/log/ceph/$cluster.log") +OPTION(mon_cluster_log_file_level, OPT_STR, "info") DEFAULT_SUBSYS(0, 5) SUBSYS(lockdep, 0, 1) diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 47f56bebee4..792bc682de4 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -129,16 +129,18 @@ void LogMonitor::update_from_paxos(bool *need_bootstrap) le.decode(p); dout(7) << "update_from_paxos applying incremental log " << summary.version+1 << " " << le << dendl; - stringstream ss; - ss << le; - string s = ss.str(); - if (g_conf->mon_cluster_log_to_syslog) { le.log_to_syslog(g_conf->mon_cluster_log_to_syslog_level, g_conf->mon_cluster_log_to_syslog_facility); } if (g_conf->mon_cluster_log_file.length()) { - blog.append(s + "\n"); + int min = string_to_syslog_level(g_conf->mon_cluster_log_file_level); + int l = clog_type_to_syslog_level(le.type); + if (l <= min) { + stringstream ss; + ss << le << "\n"; + blog.append(ss.str()); + } } summary.add(le); |