make log level settings avail in config file (#63)

config/hyperion.config.json.commented

@@ -4,6 +4,12 @@
 
 
 {
+	/// set log level: silent warn verbose debug
+	"logger" :
+	{
+		"level" : "warn"
+	},
+
 	/// Device configuration contains the following fields: 
 	/// * 'name'       : The user friendly name of the device (only used for display purposes)
 	/// * 'type'       : The type of the device or leds (known types for now are

config/hyperion.config.json.default

@@ -1,4 +1,9 @@
 {
+	"logger" :
+	{
+		"level" : "warn"
+	},
+
 	"device" :
 	{
 		"name"       : "DefaultHyperionConfig",

include/utils/Logger.h

@@ -27,12 +27,14 @@ class Logger
 public:
 	enum LogLevel { UNSET=0,DEBUG=1, INFO=2,WARNING=3,ERROR=4,OFF=5 };
 
-	static Logger* getInstance(std::string name="", LogLevel minLevel=Logger::INFO);
+	static Logger*  getInstance(std::string name="", LogLevel minLevel=Logger::INFO);
-	static void deleteInstance(std::string name="");
+	static void     deleteInstance(std::string name="");
-	static void setLogLevel(LogLevel level,std::string name="");
+	static void     setLogLevel(LogLevel level,std::string name="");
+	static LogLevel getLogLevel(std::string name="");
 
-	void Message(LogLevel level, const char* sourceFile, const char* func, unsigned int line, const char* fmt, ...);
+	void     Message(LogLevel level, const char* sourceFile, const char* func, unsigned int line, const char* fmt, ...);
-	void setMinLevel(LogLevel level) { _minLevel = level; };
+	void     setMinLevel(LogLevel level) { _minLevel = level; };
+	LogLevel getMinLevel() { return _minLevel; };
 
 protected:
 	Logger( std::string name="", LogLevel minLevel=INFO);

libsrc/utils/Logger.cpp

@@ -75,6 +75,16 @@ void Logger::setLogLevel(LogLevel level,std::string name)
 	}
 }
 
+Logger::LogLevel Logger::getLogLevel(std::string name)
+{
+	if ( name.empty() )
+	{
+		return GLOBAL_MIN_LOG_LEVEL;
+	}
+
+	Logger* log = Logger::getInstance(name);
+	return log->getMinLevel();
+}
 
 Logger::Logger ( std::string name, LogLevel minLevel ):
 	_name(name),

src/hyperiond/hyperiond.cpp

@@ -42,6 +42,26 @@ HyperionDaemon::HyperionDaemon(std::string configFile, QObject *parent)
 {
 	loadConfig(configFile);
 	_hyperion = Hyperion::initInstance(_config, configFile);
+	
+	if (Logger::getLogLevel() == Logger::WARNING)
+	{
+		if (_config.isMember("logger"))
+		{
+			const Json::Value & logConfig = _config["logger"];
+			std::string level = logConfig.get("level", "warn").asString(); // silent warn verbose debug
+			if (level == "silent") Logger::setLogLevel(Logger::OFF);
+			else if (level == "warn")    Logger::setLogLevel(Logger::WARNING);
+			else if (level == "verbose") Logger::setLogLevel(Logger::INFO);
+			else if (level == "debug")   Logger::setLogLevel(Logger::DEBUG);
+			else Error(Logger::getInstance("LOGGER"), "log level '%s' used in config is unknown. valid: silent warn verbose debug", level.c_str());
+			
+		}
+	}
+	else
+	{
+		WarningIf(_config.isMember("logger"), Logger::getInstance("LOGGER"), "Logger settings overriden by command line argument");
+	}
+	
 	Info(_log, "Hyperion started and initialised");
 }
 

src/hyperiond/hyperiond.h

@@ -75,5 +75,5 @@ private:
 	FramebufferWrapper* _fbGrabber; 
 	OsxWrapper*         _osxGrabber;
 	WebConfig*          _webConfig;
-        Hyperion*           _hyperion;
+	Hyperion*           _hyperion;
 };