diff options
| -rw-r--r-- | intern/cycles/util/util_logging.cpp | 10 | ||||
| -rw-r--r-- | intern/libmv/intern/logging.cc | 11 |
2 files changed, 7 insertions, 14 deletions
diff --git a/intern/cycles/util/util_logging.cpp b/intern/cycles/util/util_logging.cpp index e41250ab1b9..3782187d78c 100644 --- a/intern/cycles/util/util_logging.cpp +++ b/intern/cycles/util/util_logging.cpp @@ -46,17 +46,13 @@ void util_logging_init(const char *argv0) #ifdef WITH_CYCLES_LOGGING using CYCLES_GFLAGS_NAMESPACE::SetCommandLineOption; - /* Make it so ERROR messages are always print into console. */ - char severity_fatal[32]; - snprintf(severity_fatal, sizeof(severity_fatal), "%d", google::GLOG_ERROR); - google::InitGoogleLogging(argv0); SetCommandLineOption("logtostderr", "1"); if (!is_verbosity_set()) { SetCommandLineOption("v", "0"); } - SetCommandLineOption("stderrthreshold", severity_fatal); - SetCommandLineOption("minloglevel", severity_fatal); + SetCommandLineOption("stderrthreshold", "0"); + SetCommandLineOption("minloglevel", "0"); #else (void)argv0; #endif @@ -70,7 +66,7 @@ void util_logging_start() if (!is_verbosity_set()) { SetCommandLineOption("v", "2"); } - SetCommandLineOption("stderrthreshold", "1"); + SetCommandLineOption("stderrthreshold", "0"); SetCommandLineOption("minloglevel", "0"); #endif } diff --git a/intern/libmv/intern/logging.cc b/intern/libmv/intern/logging.cc index 350be29d4db..a8c7e93880d 100644 --- a/intern/libmv/intern/logging.cc +++ b/intern/libmv/intern/logging.cc @@ -35,16 +35,13 @@ static bool is_verbosity_set() { void libmv_initLogging(const char* argv0) { using LIBMV_GFLAGS_NAMESPACE::SetCommandLineOption; - // Make it so ERROR messages are always print into console. - char severity_fatal[32]; - snprintf(severity_fatal, sizeof(severity_fatal), "%d", - google::GLOG_ERROR); google::InitGoogleLogging(argv0); + SetCommandLineOption("logtostderr", "1"); if (!is_verbosity_set()) { SetCommandLineOption("v", "0"); } - SetCommandLineOption("stderrthreshold", severity_fatal); - SetCommandLineOption("minloglevel", severity_fatal); + SetCommandLineOption("stderrthreshold", "0"); + SetCommandLineOption("minloglevel", "0"); } void libmv_startDebugLogging(void) { @@ -53,7 +50,7 @@ void libmv_startDebugLogging(void) { if (!is_verbosity_set()) { SetCommandLineOption("v", "2"); } - SetCommandLineOption("stderrthreshold", "1"); + SetCommandLineOption("stderrthreshold", "0"); SetCommandLineOption("minloglevel", "0"); } |