From 40f827df58a35c68ed2527de7bf3b02c10c8eced Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 9 Oct 2013 11:24:37 +0200 Subject: [PATCH] ido_mysql, livestatus: Use Application::GetVersion(). --- components/db_ido_mysql/idomysqlconnection.cpp | 3 ++- components/livestatus/statustable.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp index 6ce43320c..54911f7eb 100644 --- a/components/db_ido_mysql/idomysqlconnection.cpp +++ b/components/db_ido_mysql/idomysqlconnection.cpp @@ -156,7 +156,8 @@ void IdoMysqlConnection::ReconnectTimerHandler(void) /* 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(m_InstanceID)) + ", NOW(), NOW(), 'icinga2 db_ido_mysql', '2.0', '" + (reconnect ? "RECONNECT" : "INITIAL") + "', NOW())"); + + Convert::ToString(static_cast(m_InstanceID)) + ", NOW(), NOW(), 'icinga2 db_ido_mysql', " + Application::GetVersion() + + ", '" + (reconnect ? "RECONNECT" : "INITIAL") + "', NOW())"); /* clear config tables for the initial config dump */ ClearConfigTables(); diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp index 7f264b5f3..c95cdba64 100644 --- a/components/livestatus/statustable.cpp +++ b/components/livestatus/statustable.cpp @@ -154,12 +154,12 @@ Value StatusTable::NumServicesAccessor(const Value& row) Value StatusTable::ProgramVersionAccessor(const Value& row) { - return "2.0"; + return Application::GetVersion(); } Value StatusTable::LivestatusVersionAccessor(const Value& row) { - return "2.0"; + return Application::GetVersion(); } Value StatusTable::LivestatusActiveConnectionsAccessor(const Value& row) -- 2.40.0