Skip to content

Fix #111: Rename LogLevel enums #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2018
Merged

Fix #111: Rename LogLevel enums #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/cppkafka/detail/callback_invoker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
16 changes: 8 additions & 8 deletions include/cppkafka/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/consumer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
}
Expand Down