From: Michael Friedrich <michael.friedrich@netways.de>
Date: Wed, 9 Oct 2013 09:24:37 +0000 (+0200)
Subject: ido_mysql, livestatus: Use Application::GetVersion().
X-Git-Tag: v0.0.3~223
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40f827df58a35c68ed2527de7bf3b02c10c8eced;p=icinga2

ido_mysql, livestatus: Use Application::GetVersion().
---

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<long>(m_InstanceID)) + ", NOW(), NOW(), 'icinga2 db_ido_mysql', '2.0', '" + (reconnect ? "RECONNECT" : "INITIAL") + "', NOW())");
+		    + Convert::ToString(static_cast<long>(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)