1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-20 01:42:27 +03:00

Merge pull request #420 from mariadb-corporation/MCOL-1235-1

mcol-1235 - fix issue with too many files open
This commit is contained in:
benthompson15
2018-03-05 13:13:58 -06:00
committed by GitHub

View File

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