Skip to content

Commit 30bfe6d

Browse files
authored
Disable any debug logs by defaults (#231)
1 parent 1243e22 commit 30bfe6d

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

src/Backends/ApMonBackend.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ApMonBackend::ApMonBackend(const std::string& path)
3939
{
4040
try {
4141
mApMon = std::make_unique<ApMon>(const_cast<char*>(path.c_str()));
42-
MonLogger::Get() << "ApMon backend initialized" << MonLogger::End();
42+
MonLogger::Get(Severity::Info) << "ApMon backend initialized" << MonLogger::End();
4343
} catch (std::runtime_error& e) {
4444
throw MonitoringException("ApMonBackend initialization", std::string(e.what()));
4545
}

src/Backends/InfluxDB.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ overloaded(Ts...)->overloaded<Ts...>;
3939
InfluxDB::InfluxDB(std::unique_ptr<transports::TransportInterface> transport)
4040
: mTransport(std::move(transport))
4141
{
42-
MonLogger::Get() << "InfluxDB backend initialized" << MonLogger::End();
42+
MonLogger::Get(Severity::Info) << "InfluxDB backend initialized" << MonLogger::End();
4343
}
4444

4545
inline unsigned long InfluxDB::convertTimestamp(const std::chrono::time_point<std::chrono::system_clock>& timestamp)

src/Backends/StdOut.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ inline unsigned long StdOut::convertTimestamp(const std::chrono::time_point<std:
4343
StdOut::StdOut(const std::string& prefix) : mPrefix(prefix)
4444
{
4545
setVerbosisty(Verbosity::Debug);
46-
MonLogger::Get() << "StdOut backend initialized" << MonLogger::End();
46+
MonLogger::Get(Severity::Info) << "StdOut backend initialized" << MonLogger::End();
4747
}
4848

4949
void StdOut::addGlobalTag(std::string_view name, std::string_view value)

src/MonLogger.h

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ namespace monitoring
2929
/// List of possible log severities
3030
enum class Severity { Error = 31,
3131
Warn = 33,
32-
Info = 49 };
32+
Info = 49,
33+
Debug = 50};
3334

3435
/// Simple Monitoring logging class
3536
class MonLogger
@@ -41,19 +42,21 @@ class MonLogger
4142
template <typename T>
4243
MonLogger& operator<<(const T& log)
4344
{
44-
mStream << log;
45+
if (MonLogger::globalSeverity >= severity) {
46+
mStream << log;
47+
}
4548
return *this;
4649
}
4750

4851
/// Singleton
4952
/// Returns Logger instance with current date and given severity
5053
/// \param severity - severity level
5154
/// \return - logger instance
52-
static MonLogger& Get(Severity severity = Severity::Info)
55+
static MonLogger& Get(Severity severity = Severity::Debug)
5356
{
5457
static MonLogger loggerInstance;
58+
loggerInstance.instanceSeverity(severity);
5559
loggerInstance.setDate();
56-
loggerInstance.setSeverity(severity);
5760
return loggerInstance;
5861
}
5962

@@ -64,7 +67,13 @@ class MonLogger
6467
return "\033[0m\n";
6568
}
6669

70+
/// Currently set severity
71+
const Severity globalSeverity = Severity::Info;
72+
6773
private:
74+
/// Instance severity
75+
Severity severity;
76+
6877
/// Log stream
6978
std::ostream& mStream;
7079

@@ -77,14 +86,15 @@ class MonLogger
7786
void setDate()
7887
{
7988
auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
80-
mStream << std::put_time(std::localtime(&now), "%Y-%m-%d %X") << "\t" << "Monitoring" << "\t";
89+
*this << std::put_time(std::localtime(&now), "%Y-%m-%d %X") << "\t" << "Monitoring" << "\t";
8190
}
8291

8392
/// Sets log color based on severity
8493
/// \param severity - log severity
85-
void setSeverity(Severity severity)
94+
void instanceSeverity(Severity desiredSeverity)
8695
{
87-
mStream << "\033[0;" << static_cast<int>(severity) << "m";
96+
severity = desiredSeverity;
97+
*this << "\033[0;" << static_cast<int>(severity) << "m";
8898
}
8999

90100
/// Delete copy and move constructors

src/Monitoring.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void Monitoring::enableProcessMonitoring(const unsigned int interval)
9090
#ifdef O2_MONITORING_OS_LINUX
9191
MonLogger::Get() << "Process Monitor : Automatic updates enabled" << MonLogger::End();
9292
#else
93-
MonLogger::Get() << "!! Process Monitor : Limited metrics available" << MonLogger::End();
93+
MonLogger::Get() << "Process Monitor : Limited metrics available" << MonLogger::End();
9494
#endif
9595
}
9696

src/ProcessMonitor.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ std::vector<Metric> ProcessMonitor::getCpuAndContexts()
102102
auto timeNow = std::chrono::high_resolution_clock::now();
103103
double timePassed = std::chrono::duration_cast<std::chrono::microseconds>(timeNow - mTimeLastRun).count();
104104
if (timePassed < 950) {
105-
MonLogger::Get() << "[WARN] Do not invoke Process Monitor more frequent then every 1s" << MonLogger::End();
105+
MonLogger::Get(Severity::Warn) << "Do not invoke Process Monitor more frequent then every 1s" << MonLogger::End();
106106
metrics.emplace_back("processPerformance");
107107
return metrics;
108108
}

0 commit comments

Comments
 (0)