3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Http: Fix logging

Browse source
This commit is contained in:
Vojtech Kral 2019-02-15 13:40:23 +01:00
parent dbfdcaa489
commit eb643a1f52
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/libslic3r/utils.cpp
View file

@ -42,22 +42,27 @@ namespace Slic3r {
static boost::log::trivial::severity_level logSeverity = boost::log::trivial::error; static boost::log::trivial::severity_level logSeverity = boost::log::trivial::error;
void set_logging_level(unsigned int level) static boost::log::trivial::severity_level level_to_boost(unsigned level)
{ {
switch (level) { switch (level) {
// Report fatal errors only. // Report fatal errors only.
case 0: logSeverity = boost::log::trivial::fatal; break; case 0: return boost::log::trivial::fatal;
// Report fatal errors and errors. // Report fatal errors and errors.
case 1: logSeverity = boost::log::trivial::error; break; case 1: return boost::log::trivial::error;
// Report fatal errors, errors and warnings. // Report fatal errors, errors and warnings.
case 2: logSeverity = boost::log::trivial::warning; break; case 2: return boost::log::trivial::warning;
// Report all errors, warnings and infos. // Report all errors, warnings and infos.
case 3: logSeverity = boost::log::trivial::info; break; case 3: return boost::log::trivial::info;
// Report all errors, warnings, infos and debugging. // Report all errors, warnings, infos and debugging.
case 4: logSeverity = boost::log::trivial::debug; break; case 4: return boost::log::trivial::debug;
// Report everyting including fine level tracing information. // Report everyting including fine level tracing information.
default: logSeverity = boost::log::trivial::trace; break; default: return boost::log::trivial::trace;
} }
}
void set_logging_level(unsigned int level)
{
logSeverity = level_to_boost(level);
boost::log::core::get()->set_filter boost::log::core::get()->set_filter
( (
@ -73,6 +78,7 @@ unsigned get_logging_level()
case boost::log::trivial::warning : return 2; case boost::log::trivial::warning : return 2;
case boost::log::trivial::info : return 3; case boost::log::trivial::info : return 3;
case boost::log::trivial::debug : return 4; case boost::log::trivial::debug : return 4;
case boost::log::trivial::trace : return 5;
default: return 1; default: return 1;
} }
} }
@ -88,21 +94,7 @@ static struct RunOnInit {
void trace(unsigned int level, const char *message) void trace(unsigned int level, const char *message)
{ {
boost::log::trivial::severity_level severity = boost::log::trivial::trace; boost::log::trivial::severity_level severity = level_to_boost(level);
switch (level) {
// Report fatal errors only.
case 0: severity = boost::log::trivial::fatal; break;
// Report fatal errors and errors.
case 1: severity = boost::log::trivial::error; break;
// Report fatal errors, errors and warnings.
case 2: severity = boost::log::trivial::warning; break;
// Report all errors, warnings and infos.
case 3: severity = boost::log::trivial::info; break;
// Report all errors, warnings, infos and debugging.
case 4: severity = boost::log::trivial::debug; break;
// Report everyting including fine level tracing information.
default: severity = boost::log::trivial::trace; break;
}
BOOST_LOG_STREAM_WITH_PARAMS(::boost::log::trivial::logger::get(),\ BOOST_LOG_STREAM_WITH_PARAMS(::boost::log::trivial::logger::get(),\
(::boost::log::keywords::severity = severity)) << message; (::boost::log::keywords::severity = severity)) << message;

2
src/slic3r/Utils/Http.cpp
View file

@ -244,7 +244,7 @@ void Http::priv::http_perform()
::curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, static_cast<void*>(this)); ::curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, static_cast<void*>(this));
#endif #endif
::curl_easy_setopt(curl, CURLOPT_VERBOSE, get_logging_level() >= 4); ::curl_easy_setopt(curl, CURLOPT_VERBOSE, get_logging_level() >= 5);
if (headerlist != nullptr) { if (headerlist != nullptr) {
::curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist); ::curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);