Date: Thursday, January 18, 2007 @ 15:23:02
Author: marc
Path: /cvsroot/carob/carob/src
Modified: Common.cpp (1.62 -> 1.63)
Partial revert of 1.51: removed logInit() method, since
tryUTF8locale() is no more called at static initialization time.
Relates to CAROB-79 and CAROB-74 "segfault if the hardcoded
local is not installed" (now a run-time error instead).
------------+
Common.cpp | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
Index: carob/src/Common.cpp
diff -u carob/src/Common.cpp:1.62 carob/src/Common.cpp:1.63
--- carob/src/Common.cpp:1.62 Thu Jan 18 15:04:31 2007
+++ carob/src/Common.cpp Thu Jan 18 15:23:02 2007
@@ -172,20 +172,6 @@
#endif
}
-namespace {
-/**
- Special function for logs during initialization
- can't use LOG4CXX loggers, initialization problem (order?)
-*/
-void logInit(CarobNS::LogLevel level, const wstring& fctName, const wstring& s)
-{
- // TODO
- if (level>=CarobNS::LOG_LEVEL_FATAL)
- wcerr << L'(' << fctName << L") " << s << endl;
-}
-
-}
-
bool CarobNS::isDebugEnabled()
{
#ifdef CAROB_LOG4CXX_NAME
@@ -256,12 +242,12 @@
// 1. trying hardwired macro
try {
- logInit(LOG_LEVEL_INFO, funcname,
+ logInfo(funcname,
L"1. trying to use locale: " NAME_OF_ANY_UTF8_LOCALE_AVAILABLE);
return trylocale(NAME_OF_ANY_UTF8_LOCALE_AVAILABLE);
} catch (CodecException& ce) {
- logInit(LOG_LEVEL_WARN, funcname,
- L"please install the " NAME_OF_ANY_UTF8_LOCALE_AVAILABLE "
locale");
+ logWarn(funcname,
+ L"please install the " NAME_OF_ANY_UTF8_LOCALE_AVAILABLE "
locale");
}
// 2. try to fallback on the user defined locale
@@ -271,7 +257,7 @@
} catch (std::runtime_error&) {
user_loc = std::locale().name();
}
- logInit(LOG_LEVEL_INFO,funcname,
+ logInfo(funcname,
std::wstring(L"2. trying to fallback on locale: ")
+ fromString(user_loc));
@@ -293,7 +279,7 @@
// out_of_range => not found
}
- logInit(LOG_LEVEL_WARN, funcname, fromString(user_loc)
+ logWarn(funcname, fromString(user_loc)
+ L" does not seem to be an utf8 locale either");
@@ -313,17 +299,17 @@
for (int i=0; i<2; i++)
try {
- logInit(LOG_LEVEL_INFO, funcname, std::wstring(L"3n. trying to fall
back on locale ")
+ logInfo(funcname, std::wstring(L"3n. trying to fall back on locale ")
+ fromString(hacked_names[i]));
return trylocale(hacked_names[i].c_str());
} catch (CodecException&) {
- logInit(LOG_LEVEL_WARN, funcname,
+ logWarn(funcname,
std::wstring(L"or please install locale ")
+ fromString(hacked_names[i]));
}
// 4. nothing found
- logInit(LOG_LEVEL_FATAL, funcname,
+ logFatal(funcname,
std::wstring(L"Please install one of the following locales: "
NAME_OF_ANY_UTF8_LOCALE_AVAILABLE ", ")
+ fromString(user_loc) + L", "
@@ -349,7 +335,7 @@
try {
return std::locale("");
} catch (std::runtime_error& ) {
- logInit(CarobNS::LOG_LEVEL_WARN, __WFILE__ L":tryuserlocale()",
+ CarobNS::logWarn(__WFILE__ L":tryuserlocale()",
L"Missing user-preferred locale (check LANG). "
"Falling back on current global locale.");
return std::locale();
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
