updated logging

dusty-nv · Jun 16, 2020 · d952e05 · d952e05
1 parent 6dfd70b
commit d952e05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/logging.cpp b/logging.cpp
@@ -48,10 +48,11 @@ void Log::ParseCmdLine( const commandLine& cmdLine )
 	}
 	else
 	{
-		if( cmdLine.GetFlag("debug") )
-			SetLevel(DEBUG);		
 		if( cmdLine.GetFlag("verbose") )
 			SetLevel(VERBOSE);
+
+		if( cmdLine.GetFlag("debug") )
+			SetLevel(DEBUG);		
 	}
 
 	SetFile(cmdLine.GetString("log-file"));
@@ -108,6 +109,7 @@ const char* Log::LevelToStr( Log::Level level )
 {
 	switch(level)
 	{
+		case SILENT:	return "silent";
 		case ERROR:    return "error";
 		case WARNING:  return "warning";
 		case SUCCESS:  return "success";
@@ -134,6 +136,9 @@ Log::Level Log::LevelFromStr( const char* str )
 			return level;
 	}
 
+	if( strcasecmp(str, "disable") == 0 || strcasecmp(str, "disabled") == 0 || strcasecmp(str, "none") == 0 )
+		return SILENT;
+
 	return DEFAULT;
 }
 

diff --git a/logging.h b/logging.h
@@ -40,7 +40,8 @@ class Log
 	 */
 	enum Level
 	{
-		ERROR = 0,
+		SILENT = 0,
+		ERROR,
 		WARNING,
 		SUCCESS,
 		INFO,
@@ -110,9 +111,7 @@ class Log
  * @ingroup log
  * @internal
  */
-#define LogMessage(level, format, args...)        \
-			if( level <= Log::GetLevel() )	\
-				fprintf(Log::GetFile(), format, ## args)		\
+#define LogMessage(level, format, args...) if( level <= Log::GetLevel() ) fprintf(Log::GetFile(), format, ## args)
 
 /**
  * @ingroup log