Add EXIT level for log (#60)

* Add EXIT level for log (#59) * Rename log level (#59)
baidu · Jan 3, 2017 · 1ed9550 · 1ed9550
1 parent 177bd34
commit 1ed9550
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/include/logging.h b/include/logging.h
@@ -16,7 +16,8 @@ enum LogLevel {
     DEBUG = 2,
     INFO = 4,
     WARNING = 8,
-    FATAL = 16,
+    ERROR = 16,
+    FATAL = 32,
 };
 
 void SetLogLevel(int level);
@@ -47,6 +48,7 @@ class LogStream {
 using common::DEBUG;
 using common::INFO;
 using common::WARNING;
+using common::ERROR;
 using common::FATAL;
 
 } // namespace baidu

diff --git a/src/logging.cc b/src/logging.cc
@@ -290,7 +290,7 @@ void Logv(int log_level, const char* format, va_list ap) {
     }
 
     static const char level_char[] = {
-        'V', 'D', 'I', 'W', 'F'
+        'V', 'D', 'I', 'W', 'E', 'F'
     };
     char cur_level = level_char[0];
     if (log_level < DEBUG) {
@@ -299,10 +299,12 @@ void Logv(int log_level, const char* format, va_list ap) {
         cur_level = level_char[1];
     } else if (log_level < WARNING) {
         cur_level = level_char[2];
-    } else if (log_level < FATAL) {
+    } else if (log_level < ERROR) {
         cur_level = level_char[3];
-    } else {
+    } else if (log_level < FATAL) {
         cur_level = level_char[4];
+    } else {
+        cur_level = level_char[5];
     }
 
     // We try twice: the first time with a fixed-size stack allocated buffer,
@@ -358,7 +360,7 @@ void Logv(int log_level, const char* format, va_list ap) {
         //    fflush(g_warning_file);
         //}
         g_logger.WriteLog(log_level, base, p - base);
-        if (log_level >= FATAL) {
+        if (log_level >= ERROR) {
             g_logger.Flush();
         }
         if (base != buffer) {
@@ -376,7 +378,7 @@ void Log(int level, const char* fmt, ...) {
         Logv(level, fmt, ap);
     }
     va_end(ap);
-    if (level >= FATAL) {
+    if (level == FATAL) {
         abort();
     }
 }