From bb4f13a47cbd6383a3a6e6070850b78673bfee1b Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Thu, 12 Jan 2017 23:25:32 +0100 Subject: [PATCH] Use internal logger instead of std stream --- src/tools/contract.cpp | 4 +++- src/tools/extract.cpp | 4 +++- src/tools/routed.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/tools/contract.cpp b/src/tools/contract.cpp index cd7f4c522..2418246b8 100644 --- a/src/tools/contract.cpp +++ b/src/tools/contract.cpp @@ -179,8 +179,10 @@ catch (const std::bad_alloc &e) util::Log(logERROR) << "Please provide more memory or consider using a larger swapfile"; return EXIT_FAILURE; } +#ifdef _WIN32 catch (const std::exception &e) { - std::cerr << "[exception] " << e.what(); + util::Log(logERROR) << "[exception] " << e.what(); return EXIT_FAILURE; } +#endif diff --git a/src/tools/extract.cpp b/src/tools/extract.cpp index 6b40ab187..985921552 100644 --- a/src/tools/extract.cpp +++ b/src/tools/extract.cpp @@ -172,8 +172,10 @@ catch (const std::bad_alloc &e) util::Log(logERROR) << "Please provide more memory or consider using a larger swapfile"; return EXIT_FAILURE; } +#ifdef _WIN32 catch (const std::exception &e) { - std::cerr << "[exception] " << e.what(); + util::Log(logERROR) << "[exception] " << e.what() << std::endl; return EXIT_FAILURE; } +#endif diff --git a/src/tools/routed.cpp b/src/tools/routed.cpp index d2e3c4598..c9be99f0a 100644 --- a/src/tools/routed.cpp +++ b/src/tools/routed.cpp @@ -350,8 +350,10 @@ catch (const std::bad_alloc &e) util::Log(logWARNING) << "Please provide more memory or consider using a larger swapfile"; return EXIT_FAILURE; } +#ifdef _WIN32 catch (const std::exception &e) { - std::cerr << "[exception] " << e.what(); + util::Log(logERROR) << "[exception] " << e.what(); return EXIT_FAILURE; } +#endif