tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

IdoMysqlConnection: Add conninfo entry, set session to utc.

Browse Source 
fíxes #4783
fíxes #4790
This commit is contained in:
Michael Friedrich 2013-10-01 14:01:59 +02:00
parent 7a6139a219
commit e63b752457
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -40,3 +40,4 @@ docs/dev
m4/ylwrap m4/ylwrap
m4/test-driver m4/test-driver
icinga2-*.tar.gz icinga2-*.tar.gz
icinga2.spec

12
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -82,6 +82,8 @@ void IdoMysqlConnection::ReconnectTimerHandler(void)
{ {
boost::mutex::scoped_lock lock(m_ConnectionMutex); boost::mutex::scoped_lock lock(m_ConnectionMutex);
bool reconnect = false;
if (m_Connected) { if (m_Connected) {
/* Check if we're really still connected */ /* Check if we're really still connected */
if (mysql_ping(&m_Connection) == 0) if (mysql_ping(&m_Connection) == 0)
@ -89,6 +91,7 @@ void IdoMysqlConnection::ReconnectTimerHandler(void)
mysql_close(&m_Connection); mysql_close(&m_Connection);
m_Connected = false; m_Connected = false;
reconnect = true;
} }
String ihost, iuser, ipasswd, idb; String ihost, iuser, ipasswd, idb;
@ -147,6 +150,15 @@ void IdoMysqlConnection::ReconnectTimerHandler(void)
msgbuf << "MySQL IDO instance id: " << static_cast<long>(m_InstanceID) << " (schema version: '" + version + "')"; msgbuf << "MySQL IDO instance id: " << static_cast<long>(m_InstanceID) << " (schema version: '" + version + "')";
Log(LogInformation, "db_ido_mysql", msgbuf.str()); Log(LogInformation, "db_ido_mysql", msgbuf.str());
/* set session time zone to utc */
Query("SET SESSION TIME_ZONE='+00:00'");
/* record connection */
Query("INSERT INTO " + GetTablePrefix() + "conninfo " +
"(instance_id, connect_time, last_checkin_time, agent_name, agent_version, connect_type, data_start_time) VALUES ("
+ Convert::ToString(static_cast<long>(m_InstanceID)) + ", NOW(), NOW(), 'icinga2 db_ido_mysql', '2.0', '" + (reconnect ? "RECONNECT" : "INITIAL") + "', NOW())");
/* clear config tables for the initial config dump */
ClearConfigTables(); ClearConfigTables();
Query("UPDATE " + GetTablePrefix() + "objects SET is_active = 0"); Query("UPDATE " + GetTablePrefix() + "objects SET is_active = 0");