Fix #111: Rename LogLevel enums (#112)

zenonparker · mfontanini · commit d3ef9cad3247 · 2018-08-30T11:28:12.000-07:00
diff --git a/include/cppkafka/detail/callback_invoker.h b/include/cppkafka/detail/callback_invoker.h
@@ -101,15 +101,15 @@ class CallbackInvoker
                 try {
                     // Log it
                     handle_->get_configuration().get_log_callback()(*handle_,
-                                                                    static_cast<int>(LogLevel::LOG_ERR),
+                                                                    static_cast<int>(LogLevel::LogErr),
                                                                     library_name,
                                                                     error_msg.str());
                 }
                 catch (...) {} // sink everything
             }
             else {
                 rd_kafka_log_print(handle_->get_handle(),
-                                   static_cast<int>(LogLevel::LOG_ERR),
+                                   static_cast<int>(LogLevel::LogErr),
                                    library_name,
                                    error_msg.str().c_str());
             }
diff --git a/include/cppkafka/logging.h b/include/cppkafka/logging.h
@@ -34,14 +34,14 @@ namespace cppkafka {
 
 // Based on syslog.h levels
 enum class LogLevel : int {
-    LOG_EMERG   = 0,    /* system is unusable */
-    LOG_ALERT   = 1,    /* action must be taken immediately */
-    LOG_CRIT    = 2,    /* critical conditions */
-    LOG_ERR     = 3,    /* error conditions */
-    LOG_WARNING = 4,    /* warning conditions */
-    LOG_NOTICE  = 5,    /* normal but significant condition */
-    LOG_INFO    = 6,    /* informational */
-    LOG_DEBUG   = 7     /* debug-level messages */
+    LogEmerg   = 0,    /* system is unusable */
+    LogAlert   = 1,    /* action must be taken immediately */
+    LogCrit    = 2,    /* critical conditions */
+    LogErr     = 3,    /* error conditions */
+    LogWarning = 4,    /* warning conditions */
+    LogNotice  = 5,    /* normal but significant condition */
+    LogInfo    = 6,    /* informational */
+    LogDebug   = 7     /* debug-level messages */
 };
 
 } //cppkafka
diff --git a/src/consumer.cpp b/src/consumer.cpp
@@ -99,10 +99,10 @@ Consumer::~Consumer() {
             error_cb(*this, static_cast<int>(ex.get_error().get_error()), error_msg.str());
         }
         else if (logger_cb) {
-            logger_cb(*this, static_cast<int>(LogLevel::LOG_ERR), "cppkafka", error_msg.str());
+            logger_cb(*this, static_cast<int>(LogLevel::LogErr), "cppkafka", error_msg.str());
         }
         else {
-            rd_kafka_log_print(get_handle(), static_cast<int>(LogLevel::LOG_ERR), "cppkafka", error_msg.str().c_str());
+            rd_kafka_log_print(get_handle(), static_cast<int>(LogLevel::LogErr), "cppkafka", error_msg.str().c_str());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -101,15 +101,15 @@ class CallbackInvoker`
`101`	`101`	`try {`
`102`	`102`	`// Log it`
`103`	`103`	`handle_->get_configuration().get_log_callback()(*handle_,`
`104`		`- static_cast<int>(LogLevel::LOG_ERR),`
	`104`	`+ static_cast<int>(LogLevel::LogErr),`
`105`	`105`	`library_name,`
`106`	`106`	`error_msg.str());`
`107`	`107`	`}`
`108`	`108`	`catch (...) {} // sink everything`
`109`	`109`	`}`
`110`	`110`	`else {`
`111`	`111`	`rd_kafka_log_print(handle_->get_handle(),`
`112`		`- static_cast<int>(LogLevel::LOG_ERR),`
	`112`	`+ static_cast<int>(LogLevel::LogErr),`
`113`	`113`	`library_name,`
`114`	`114`	`error_msg.str().c_str());`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,10 @@ Consumer::~Consumer() {`
`99`	`99`	`error_cb(*this, static_cast<int>(ex.get_error().get_error()), error_msg.str());`
`100`	`100`	`}`
`101`	`101`	`else if (logger_cb) {`
`102`		`- logger_cb(*this, static_cast<int>(LogLevel::LOG_ERR), "cppkafka", error_msg.str());`
	`102`	`+ logger_cb(*this, static_cast<int>(LogLevel::LogErr), "cppkafka", error_msg.str());`
`103`	`103`	`}`
`104`	`104`	`else {`
`105`		`- rd_kafka_log_print(get_handle(), static_cast<int>(LogLevel::LOG_ERR), "cppkafka", error_msg.str().c_str());`
	`105`	`+ rd_kafka_log_print(get_handle(), static_cast<int>(LogLevel::LogErr), "cppkafka", error_msg.str().c_str());`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`