Skip to content

Commit

Permalink
Merge pull request #196 from loki-project/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Beaudan Campbell-Brown authored Jun 28, 2019
2 parents ed16d80 + 21e50ca commit c0fa2c2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions httpserver/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ int main(int argc, char* argv[]) {

spdlog::level::level_enum log_level;
if (!parse_log_level(log_level_string, log_level)) {
LOKI_LOG(error, "Incorrect log level {}", log_level_string);
std::cerr << "Incorrect log level: " << log_level_string << std::endl;
print_usage(desc, argv);
return EXIT_FAILURE;
}
Expand Down Expand Up @@ -236,10 +236,10 @@ int main(int argc, char* argv[]) {
} catch (const std::exception& e) {
// It seems possible for logging to throw its own exception,
// in which case it will be propagated to libc...
LOKI_LOG(error, "Exception caught in main: {}", e.what());
std::cerr << "Exception caught in main: " << e.what() << std::endl;
return EXIT_FAILURE;
} catch (...) {
LOKI_LOG(error, "Unknown exception caught in main.");
std::cerr << "Unknown exception caught in main." << std::endl;
return EXIT_FAILURE;
}
}

0 comments on commit c0fa2c2

Please sign in to comment.