database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-25 20:23:16 +03:00
Code Activity

Merge branch 'develop-1.1' into dev-merge-up-20180409

Browse Source
This commit is contained in:
Andrew Hutchings
2018-04-09 19:15:18 +01:00
parent 7075b9571d 3eb36e6bf9
commit 280dcb44bf
31 changed files with 304 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
procmgr/main.cpp
View File

@@ -594,7 +594,10 @@ static void alarmMessageThread(Configuration config)
msg = fIos.read();
if (msg.length() <= 0)
{
fIos.close();
continue;
}
//log.writeLog(__LINE__, "MSG RECEIVED: Process Alarm Message");
@@ -626,16 +629,20 @@ static void alarmMessageThread(Configuration config)
ALARMManager aManager;
aManager.processAlarmReport(calAlarm);
fIos.close();
}
catch (exception& ex)
{
string error = ex.what();
log.writeLog(__LINE__, "EXCEPTION ERROR on read for ProcMgr_Alarm:" + error, LOG_TYPE_ERROR);
fIos.close();
continue;
}
catch (...)
{
log.writeLog(__LINE__, "EXCEPTION ERROR on read for ProcMgr_Alarm: Caught unknown exception!", LOG_TYPE_ERROR);
fIos.close();
continue;
}
}