logging: rename the `DEBUG` log level to `DBG`

[folly.git] / folly / experimental / logging / LogLevel.cpp

diff --git a/folly/experimental/logging/LogLevel.cpp b/folly/experimental/logging/LogLevel.cpp
index a60e024eb85bec2a1698baaf1f635de796becce4..2858957f2fccd72144866dfac2bed7e3d0002835 100644 (file)
--- a/folly/experimental/logging/LogLevel.cpp
+++ b/folly/experimental/logging/LogLevel.cpp
@@ -34,7 +34,7 @@ LogLevel stringToLogLevel(StringPiece name) {
 
   // If the string is of the form "LogLevel::foo" or "LogLevel(foo)"
   // strip it down just to "foo".  This makes sure we can process both
-  // the "LogLevel::DEBUG" and "LogLevel(1234)" formats produced by
+  // the "LogLevel::WARN" and "LogLevel(1234)" formats produced by
   // logLevelToString().
   constexpr StringPiece lowercasePrefix{"loglevel::"};
   constexpr StringPiece wrapperPrefix{"loglevel("};
@@ -49,8 +49,8 @@ LogLevel stringToLogLevel(StringPiece name) {
     return LogLevel::UNINITIALIZED;
   } else if (lowerName == "none") {
     return LogLevel::NONE;
-  } else if (lowerName == "debug") {
-    return LogLevel::DEBUG;
+  } else if (lowerName == "debug" || lowerName == "dbg") {
+    return LogLevel::DBG;
   } else if (lowerName == "info") {
     return LogLevel::INFO;
   } else if (lowerName == "warn" || lowerName == "warning") {
@@ -59,6 +59,10 @@ LogLevel stringToLogLevel(StringPiece name) {
     return LogLevel::ERR;
   } else if (lowerName == "critical") {
     return LogLevel::CRITICAL;
+  } else if (lowerName == "dfatal") {
+    return LogLevel::DFATAL;
+  } else if (lowerName == "fatal") {
+    return LogLevel::FATAL;
   } else if (lowerName == "max" || lowerName == "max_level") {
     return LogLevel::MAX_LEVEL;
   }
@@ -76,35 +80,37 @@ LogLevel stringToLogLevel(StringPiece name) {
   try {
     auto level = folly::to<uint32_t>(lowerName);
     return static_cast<LogLevel>(level);
-  } catch (const std::exception& ex) {
-    throw std::range_error("invalid logger name " + name.str());
+  } catch (const std::exception&) {
+    throw std::range_error("invalid logger level: " + name.str());
   }
 }
 
 string logLevelToString(LogLevel level) {
   if (level == LogLevel::UNINITIALIZED) {
-    return "LogLevel::UNINITIALIZED";
+    return "UNINITIALIZED";
   } else if (level == LogLevel::NONE) {
-    return "LogLevel::NONE";
-  } else if (level == LogLevel::DEBUG) {
-    return "LogLevel::DEBUG";
+    return "NONE";
+  } else if (level == LogLevel::DBG) {
+    return "DEBUG";
   } else if (level == LogLevel::INFO) {
-    return "LogLevel::INFO";
+    return "INFO";
   } else if (level == LogLevel::WARN) {
-    return "LogLevel::WARN";
+    return "WARN";
   } else if (level == LogLevel::ERR) {
-    return "LogLevel::ERR";
+    return "ERR";
   } else if (level == LogLevel::CRITICAL) {
-    return "LogLevel::CRITICAL";
-  } else if (level == LogLevel::MAX_LEVEL) {
-    return "LogLevel::MAX_LEVEL";
+    return "CRITICAL";
+  } else if (level == LogLevel::DFATAL) {
+    return "DFATAL";
+  } else if (level == LogLevel::FATAL) {
+    return "FATAL";
   }
 
   if (static_cast<uint32_t>(level) <= static_cast<uint32_t>(LogLevel::DBG0) &&
-      static_cast<uint32_t>(level) > static_cast<uint32_t>(LogLevel::DEBUG)) {
+      static_cast<uint32_t>(level) > static_cast<uint32_t>(LogLevel::DBG)) {
     auto num =
         static_cast<uint32_t>(LogLevel::DBG0) - static_cast<uint32_t>(level);
-    return folly::to<string>("LogLevel::DBG", num);
+    return folly::to<string>("DBG", num);
   }
   return folly::to<string>("LogLevel(", static_cast<uint32_t>(level), ")");
 }
@@ -113,4 +119,4 @@ std::ostream& operator<<(std::ostream& os, LogLevel level) {
   os << logLevelToString(level);
   return os;
 }
-}
+} // namespace folly