support lowcase log config

jirmjos · Jan 28, 2017 · 83ec0ef · 83ec0ef
1 parent 4a252fc
commit 83ec0ef
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/libutils/logging.cpp b/libutils/logging.cpp
@@ -18,10 +18,10 @@ LogParam::LogParam()
 #ifdef USE_CONFIG
 LogParam::LogParam(CConfigItem node)
 {
-	FileName = node.getStr("FileName");
-	LogTime = (node.getStr("LogTime", false, "yes")=="yes")?true:false;
-	ConsoleLevel = node.getInt("ConsoleLevel", false, -1);
-	FileLevel = node.getInt("FileLevel", false, 0);
+	FileName = node.getStr("FileName", false, node.getStr("file_name"));
+	LogTime = (node.getStr("LogTime", false, node.getStr("log_time", false, "yes"))=="yes")?true:false;
+	ConsoleLevel = node.getInt("ConsoleLevel", false, node.getInt("console_level", false, -1));
+	FileLevel = node.getInt("FileLevel", false, node.getInt("file_level", false, 0));
 }
 #endif
 
@@ -112,10 +112,13 @@ void CLog::Init(CConfigItem *Config)
 {
 	CConfigItemList nodes;
 	Config->getList("Log", nodes);
+
+	if (nodes.size()==0)
+		Config->getList("log", nodes);
 
 	for(CConfigItemList::iterator i=nodes.begin();i!=nodes.end();i++)
 	{
-		m_LogsCfg[(*i)->getStr("Name")] = LogParam(**i);
+		m_LogsCfg[(*i)->getStr("Name", false, (*i)->getStr("name"))] = LogParam(**i);
 	}
 }
 #endif