[PATCH] osmo-trx[master]: Logger: Stop using Log.Alarms.Max from config

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Tue Jan 9 14:42:14 UTC 2018


Review at  https://gerrit.osmocom.org/5701

Logger: Stop using Log.Alarms.Max from config

This is a first step towards removing ConfigurationTable class and
sqlite3 dependency.

Change-Id: Idcd789afe668a5c0271352f1d20d2efda826213a
---
M CommonLibs/Configuration.cpp
M CommonLibs/Logger.cpp
2 files changed, 2 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/01/5701/1

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 @@
 
 	// 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 @@
 {
     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();
 }
 

-- 
To view, visit https://gerrit.osmocom.org/5701
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcd789afe668a5c0271352f1d20d2efda826213a
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>



More information about the gerrit-log mailing list