database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
David Hill
2018-09-19 14:01:08 -05:00
parent 9e64034347
commit 45b20b4a9a
6 changed files with 1145 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
oamapps/alarmmanager/alarmmanager.cpp
View File

@ -463,7 +463,7 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
int pid = getpid();
int tid = gettid();
// get reporting Pprocess Name
// get reporting Process Name
string processName;
if ( repProcessName.empty())
@ -505,8 +505,39 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
// shutdown connection
procmgr.shutdown();
}
catch (std::runtime_error& e)
{
LoggingID lid(11);
MessageLog ml(lid);
Message msg;
Message::Args args;
args.add("sendAlarmReport error:");
args.add(e.what());
msg.format(args);
ml.logDebugMessage(msg);
}
catch (std::exception& e)
{
LoggingID lid(11);
MessageLog ml(lid);
Message msg;
Message::Args args;
args.add("sendAlarmReport error:");
args.add(e.what());
msg.format(args);
ml.logDebugMessage(msg);
}
catch (...)
{}
{
LoggingID lid(11);
MessageLog ml(lid);
Message msg;
Message::Args args;
args.add("sendAlarmReport error:");
args.add("general failure");
msg.format(args);
ml.logDebugMessage(msg);
}
return;
#endif //SKIP_ALARM

1343
oamapps/postConfigure/postConfigure.cpp
View File

File diff suppressed because it is too large Load Diff