aboutsummaryrefslogtreecommitdiffstats
path: root/CommonLibs/Logger.cpp
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-02-20 17:38:18 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2018-02-20 18:26:45 +0100
commit8bd111c942d0d8d2c65369db8f2623eadef54c1e (patch)
tree1abe84932d9acae2d2cd85e7c508e0f597ff7394 /CommonLibs/Logger.cpp
parent3808e479aa1d1be6bfb1320aa4a7202a14db3ae8 (diff)
Logger: get rid of alarm APIs
It's only used internally inside the Logger module, and in case there's an "alarm" (level more than critical) we still print on cerr, so we can just rely on our system catching stderr instead of stdout to handle it. Change-Id: I6d6df1578c3a4c1a37bd0d69952d443f62eed2ab
Diffstat (limited to 'CommonLibs/Logger.cpp')
-rw-r--r--CommonLibs/Logger.cpp47
1 files changed, 0 insertions, 47 deletions
diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp
index ee607fd..4bfb782 100644
--- a/CommonLibs/Logger.cpp
+++ b/CommonLibs/Logger.cpp
@@ -35,8 +35,6 @@
#include "Logger.h"
#include "Threads.h" // pat added
-#define MAX_ALARMS 20
-
using namespace std;
// Switches to enable/disable logging targets
@@ -48,26 +46,6 @@ Mutex gLogToLock;
// Global log level threshold:
int config_log_level;
-/**@ The global alarms table. */
-//@{
-Mutex alarmsLock;
-list<string> alarmsList;
-void addAlarm(const string&);
-//@}
-
-
-
-// (pat) If Log messages are printed before the classes in this module are inited
-// (which happens when static classes have constructors that do work)
-// the OpenBTS just crashes.
-// Prevent that by setting sLoggerInited to true when this module is inited.
-static bool sLoggerInited = 0;
-static struct CheckLoggerInitStatus {
- CheckLoggerInitStatus() { sLoggerInited = 1; }
-} sCheckloggerInitStatus;
-
-
-
/** Names of the logging levels. */
const char *levelNames[] = {
"EMERG", "ALERT", "CRIT", "ERR", "WARNING", "NOTICE", "INFO", "DEBUG"
@@ -119,36 +97,11 @@ std::ostream& operator<<(std::ostream& os, std::ostringstream& ss)
return os << ss.str();
}
-// copies the alarm list and returns it. list supposed to be small.
-list<string> gGetLoggerAlarms()
-{
- alarmsLock.lock();
- list<string> ret;
- // excuse the "complexity", but to use std::copy with a list you need
- // an insert_iterator - copy technically overwrites, doesn't insert.
- insert_iterator< list<string> > ii(ret, ret.begin());
- copy(alarmsList.begin(), alarmsList.end(), ii);
- alarmsLock.unlock();
- return ret;
-}
-
-/** Add an alarm to the alarm list. */
-void addAlarm(const string& s)
-{
- alarmsLock.lock();
- alarmsList.push_back(s);
- while (alarmsList.size() > MAX_ALARMS) alarmsList.pop_front();
- alarmsLock.unlock();
-}
-
-
Log::~Log()
{
if (mDummyInit) return;
// Anything at or above LOG_CRIT is an "alarm".
- // Save alarms in the local list and echo them to stderr.
if (mPriority <= LOG_ERR) {
- if (sLoggerInited) addAlarm(mStream.str().c_str());
cerr << mStream.str() << endl;
}
// Current logging level was already checked by the macro. So just log.