database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-3420 Don't break on bad systemlang

Browse Source 
If systemlang in the XML is not valid, fall back to "C" and log an error
This commit is contained in:
David Hall
2020-03-05 17:39:50 -06:00
parent de509501c0
commit 77fc87c98c
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
procmon/main.cpp
View File

@ -2101,7 +2101,7 @@ static void statusControlThread()
} }
} }
log.writeLog(__LINE__, "System/Module Status shared Memory allociated and Initialized", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "System/Module Status shared Memory allocated and Initialized", LOG_TYPE_DEBUG);
} }
// //
@ -2134,7 +2134,7 @@ static void statusControlThread()
memcpy(fShmNICStatus[i].Name, hostNameList[i].c_str(), NAMESIZE); memcpy(fShmNICStatus[i].Name, hostNameList[i].c_str(), NAMESIZE);
} }
log.writeLog(__LINE__, "NIC Status shared Memory allociated and Initialized", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "NIC Status shared Memory allocated and Initialized", LOG_TYPE_DEBUG);
} }
// //
@ -2191,7 +2191,7 @@ static void statusControlThread()
memcpy(fShmExtDeviceStatus[i].Name, extDeviceNameList[i].c_str(), NAMESIZE); memcpy(fShmExtDeviceStatus[i].Name, extDeviceNameList[i].c_str(), NAMESIZE);
} }
log.writeLog(__LINE__, "Ext Device Status shared Memory allociated and Initialized", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "Ext Device Status shared Memory allocated and Initialized", LOG_TYPE_DEBUG);
} }
// //
@ -2258,7 +2258,7 @@ static void statusControlThread()
memcpy(fShmDbrootStatus[i].Name, dbrootList[i].c_str(), NAMESIZE); memcpy(fShmDbrootStatus[i].Name, dbrootList[i].c_str(), NAMESIZE);
} }
log.writeLog(__LINE__, "Dbroot Status shared Memory allociated and Initialized", LOG_TYPE_DEBUG); log.writeLog(__LINE__, "Dbroot Status shared Memory allocated and Initialized", LOG_TYPE_DEBUG);
} }
//Set mainResumeFlag, to start up main thread //Set mainResumeFlag, to start up main thread

27
utils/funcexp/utils_utf8.h
View File

@ -62,6 +62,7 @@ std::string idb_setlocale()
// get and set locale language // get and set locale language
std::string systemLang("C"); std::string systemLang("C");
oam::Oam oam; oam::Oam oam;
static bool loggedMsg = false;
try try
{ {
@ -78,11 +79,27 @@ std::string idb_setlocale()
{ {
try try
{ {
//send alarm if (!loggedMsg)
alarmmanager::ALARMManager alarmMgr; {
std::string alarmItem = "system"; //send alarm
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET); alarmmanager::ALARMManager alarmMgr;
printf("Failed to set locale : %s, Critical alarm generated\n", systemLang.c_str()); std::string alarmItem = "system";
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET);
// Log one line
logging::LoggingID lid(17); // ProcessManager -- probably the only one to find this for now
logging::MessageLog ml(lid);
logging::Message msg(1);
logging::Message::Args args;
args.add("Failed to set locale ");
args.add(systemLang.c_str());
args.add(": Setting to 'C'. Critical alarm generated");
msg.format( args );
ml.logErrorMessage(msg);
loggedMsg = true;
}
systemLang = "C";
} }
catch (...) catch (...)
{ {