Fix duplicate key violation for downtimes

refs #10829
Icinga · Dec 16, 2015 · 6387bec · 6387bec
1 parent 346c0cb
commit 6387bec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
@@ -474,7 +474,7 @@ void DbEvents::AddDowntime(const Downtime::Ptr& downtime)
 void DbEvents::AddDowntimeHistory(const Downtime::Ptr& downtime)
 {
 	std::vector<DbQuery> queries;
-	AddDowntimeInternal(queries, downtime, false);
+	AddDowntimeInternal(queries, downtime, true);
 	DbObject::OnMultipleQueries(queries);
 }
 

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -821,6 +821,7 @@ void IdoMysqlConnection::InternalExecuteMultipleQueries(const std::vector<DbQuer
 
 		if (!CanExecuteQuery(query)) {
 			m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalExecuteMultipleQueries, this, queries), query.Priority);
+			return;
 		}
 	}
 

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -699,6 +699,7 @@ void IdoPgsqlConnection::InternalExecuteMultipleQueries(const std::vector<DbQuer
 
 		if (!CanExecuteQuery(query)) {
 			m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::InternalExecuteMultipleQueries, this, queries), query.Priority);
+			return;
 		}
 	}