From b91175d47a39348ae8798b484dd43819796d4c67 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 9 May 2012 23:47:34 +0200 Subject: [PATCH] Adapt logging level for some messages. Also keep default logging level during very early startup at "alert" (unless explicitly set on cmd-line). --- src/Main/locale.cxx | 9 ++++----- src/Main/options.cxx | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Main/locale.cxx b/src/Main/locale.cxx index 2f2723234..ae4cedf07 100644 --- a/src/Main/locale.cxx +++ b/src/Main/locale.cxx @@ -62,7 +62,7 @@ FGLocale::getUserLanguage() LOCALE_SISO639LANGNAME, locale, sizeof(locale))) { - SG_LOG(SG_GENERAL, SG_INFO, "Detected locale's language setting: " << locale); + SG_LOG(SG_GENERAL, SG_DEBUG, "Detected locale's language setting: " << locale); size_t i = strlen(locale); locale[i++] = '_'; if (GetLocaleInfo(LOCALE_USER_DEFAULT, @@ -71,11 +71,10 @@ FGLocale::getUserLanguage() return locale; locale[--i] = 0; - SG_LOG(SG_GENERAL, SG_INFO, "Failed to detected locale's country setting."); + SG_LOG(SG_GENERAL, SG_WARN, "Failed to detected locale's country setting."); return locale; } - SG_LOG(SG_GENERAL, SG_INFO, "Failed to obtain Windows locale information."); return NULL; } #else @@ -104,7 +103,7 @@ FGLocale::findLocaleNode(const string& language) return node; } - SG_LOG(SG_GENERAL, SG_INFO, "Searching language resource for locale: " << language); + SG_LOG(SG_GENERAL, SG_DEBUG, "Searching language resource for locale: " << language); // search locale using full string vector localeList = _intl->getChildren("locale"); @@ -149,7 +148,7 @@ FGLocale::selectLanguage(const char *language) // Use plain C locale if nothing is available. if ((language == NULL)||(language[0]==0)) { - SG_LOG(SG_GENERAL, SG_INFO, "Unable to detect system language" ); + SG_LOG(SG_GENERAL, SG_WARN, "Unable to detect system language" ); language = "C"; } diff --git a/src/Main/options.cxx b/src/Main/options.cxx index e8b39813a..d377da0dd 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -1735,7 +1735,7 @@ void Options::init(int argc, char **argv, const SGPath& appDataPath) // establish log-level before anything else - otherwise it is not possible // to show extra (debug/info/warning) messages for the start-up phase. - fgOptLogLevel(valueForOption("log-level").c_str()); + fgOptLogLevel(valueForOption("log-level", "alert").c_str()); // then config files SGPath config; -- 2.39.5