aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-01-09 13:25:38 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2018-01-09 15:26:49 +0100
commitddf4743306fe431110cfd2370227183202dac441 (patch)
treec37430026e558c542bfefba856571c4283ad14b3
parent82f83ced736b17c11f906a788895f906b42b1baa (diff)
Logger: Stop using Log.Alarms.Max from config
This is a first step towards removing ConfigurationTable class and sqlite3 dependency. Change-Id: Idcd789afe668a5c0271352f1d20d2efda826213a
-rw-r--r--CommonLibs/Configuration.cpp11
-rw-r--r--CommonLibs/Logger.cpp4
2 files changed, 2 insertions, 13 deletions
diff --git a/CommonLibs/Configuration.cpp b/CommonLibs/Configuration.cpp
index 14e5400..4661903 100644
--- a/CommonLibs/Configuration.cpp
+++ b/CommonLibs/Configuration.cpp
@@ -104,17 +104,6 @@ ConfigurationTable::ConfigurationTable(const char* filename, const char *wCmdNam
// Build CommonLibs schema
ConfigurationKey *tmp;
- tmp = new ConfigurationKey("Log.Alarms.Max","20",
- "alarms",
- ConfigurationKey::CUSTOMER,
- ConfigurationKey::VALRANGE,
- "10:20",// educated guess
- false,
- "Maximum number of alarms to remember inside the application."
- );
- mSchema[tmp->getName()] = *tmp;
- delete tmp;
-
tmp = new ConfigurationKey("Log.File","",
"",
ConfigurationKey::DEVELOPER,
diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp
index 4e4dbbc..d246584 100644
--- a/CommonLibs/Logger.cpp
+++ b/CommonLibs/Logger.cpp
@@ -36,6 +36,7 @@
#include "Logger.h"
#include "Threads.h" // pat added
+#define MAX_ALARMS 20
using namespace std;
@@ -212,8 +213,7 @@ void addAlarm(const string& s)
{
alarmsLock.lock();
alarmsList.push_back(s);
- unsigned maxAlarms = gConfig.getNum("Log.Alarms.Max");
- while (alarmsList.size() > maxAlarms) alarmsList.pop_front();
+ while (alarmsList.size() > MAX_ALARMS) alarmsList.pop_front();
alarmsLock.unlock();
}