From aeb7bc5beb2e4fbd6be851287719abfa95a1c921 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 23 Feb 2021 16:37:55 +0100 Subject: GLog: Lower default logging severity to INFO Before this change messages of ERROR and above were printed. This change makes it so LOG(INFO), LOG(WARNING), LOG(ERROR) and LOG(FATAL) will be printed to the console by default (without --debug-libmv and --debug-cycles). On a user level nothing is changed because neither INFO nor WARNING severity are used in our codebase. For developers this change allows to use LOG(INFO) to print relevant for debugging information. Bering able to see WARNING messages is also nice, since those are not related to debugging, but are about some detected "bad" state. After this change the LOG(INFO) is really treated as a printf. Why not to use printf to begin with? Because it is often more annoying to print non-scalar types. Why not to use cout? Just a convenience, so that all type of logging is handled in the same way. When one is familiar with Glog used in the area, it is easy to use same utilities during development. Also, it is easy to change LOG(INFO) to VLOG(2) when development is done and one wants to keep the log print but make it only appear when using special verbosity flags. The initial reason why default severity was set to maximum possible value is because of misuse of VLOG with verbosity level 0, which is the same as LOG(INFO). This is also why back in the days --debug-libmv was introduced. Now there is some redundancy between --debug-libmv, --debug-cyles and --verbose, but changes in their meaning will cause user level side effects. Differential Revision: https://developer.blender.org/D10513 --- intern/cycles/util/util_logging.cpp | 10 +++------- 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"); } -- cgit v1.2.3