From be85da42506fb2d3b3a25f85b080fa605445e65f Mon Sep 17 00:00:00 2001
From: Jean Flach <jean.flach@icinga.com>
Date: Mon, 25 Feb 2019 14:29:49 +0100
Subject: [PATCH] Update libs

---
 ha.go             | 16 ++++++++--------
 heartbeat.go      |  2 +-
 heartbeat_test.go |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ha.go b/ha.go
index 14747c71..d1666bdb 100644
--- a/ha.go
+++ b/ha.go
@@ -2,7 +2,7 @@ package icingadb_ha_lib
 
 import (
 	"database/sql"
-	"git.icinga.com/icingadb-connection"
+	"git.icinga.com/icingadb/icingadb-connection-lib"
 	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 	"sync/atomic"
@@ -100,7 +100,7 @@ func cleanUpInstances(dbw *icingadb_connection.DBWrapper) error {
 	log.WithFields(log.Fields{"context": "HA"}).Info("Cleaning up icingadb_instance")
 
 	errTx := dbw.SqlTransaction(true, true, func(tx *sql.Tx) error {
-		_, errExec := dbw.SqlExec(
+		_, errExec := dbw.SqlExecTx(
 			tx,
 			"delete from icingadb_instance by heartbeat",
 			`DELETE FROM icingadb_instance WHERE ? - heartbeat >= 30`,
@@ -224,7 +224,7 @@ func (h *HA) run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.D
 					}
 
 					if len(rows) > 0 {
-						_, errExec := dbw.SqlExecQuiet(
+						_, errExec := dbw.SqlExecTxQuiet(
 							tx,
 							"update icingadb_instance by id",
 							`UPDATE icingadb_instance SET environment_id=?, heartbeat=? WHERE id = ?`,
@@ -236,7 +236,7 @@ func (h *HA) run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.D
 							return errExec
 						}
 					} else {
-						_, errExec := dbw.SqlExecQuiet(
+						_, errExec := dbw.SqlExecTxQuiet(
 							tx,
 							"insert into icingadb_instance",
 							`INSERT INTO icingadb_instance(id, environment_id, heartbeat, responsible) VALUES (?, ?, ?, ?)`,
@@ -271,7 +271,7 @@ func (h *HA) run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.D
 						justTakenOver = true
 					} else if time.Now().Unix()-rows[0][1].(int64) >= 10 {
 						{
-							_, errExec := dbw.SqlExecQuiet(
+							_, errExec := dbw.SqlExecTxQuiet(
 								tx,
 								"update icingadb_instance by environment_id",
 								`UPDATE icingadb_instance SET responsible=? WHERE environment_id = ?`,
@@ -283,7 +283,7 @@ func (h *HA) run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.D
 							}
 						}
 
-						_, errExec := dbw.SqlExecQuiet(
+						_, errExec := dbw.SqlExecTxQuiet(
 							tx,
 							"update icingadb_instance by id",
 							`UPDATE icingadb_instance SET responsible=? WHERE id = ?`,
@@ -297,7 +297,7 @@ func (h *HA) run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.D
 						justTakenOver = true
 					}
 				} else {
-					_, errExec := dbw.SqlExecQuiet(
+					_, errExec := dbw.SqlExecTxQuiet(
 						tx,
 						"update icingadb_instance by id",
 						`UPDATE icingadb_instance SET responsible=? WHERE id = ?`,
@@ -362,7 +362,7 @@ func (h *HA) run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.D
 				}
 
 				if len(rows) > 0 {
-					_, errExec := dbw.SqlExecQuiet(
+					_, errExec := dbw.SqlExecTxQuiet(
 						tx,
 						"update icingadb_instance",
 						`UPDATE icingadb_instance SET responsible=? WHERE id = ?`,
diff --git a/heartbeat.go b/heartbeat.go
index 61a5a661..7a958881 100644
--- a/heartbeat.go
+++ b/heartbeat.go
@@ -3,7 +3,7 @@ package icingadb_ha_lib
 import (
 	"crypto/sha1"
 	"encoding/json"
-	"git.icinga.com/icingadb-connection"
+	"git.icinga.com/icingadb/icingadb-connection-lib"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/heartbeat_test.go b/heartbeat_test.go
index bacc5437..0dca805c 100644
--- a/heartbeat_test.go
+++ b/heartbeat_test.go
@@ -2,7 +2,7 @@ package icingadb_ha_lib
 
 import (
 	"encoding/json"
-	"git.icinga.com/icingadb-connection"
+	"git.icinga.com/icingadb/icingadb-connection-lib"
 	"github.com/go-redis/redis"
 	"github.com/stretchr/testify/assert"
 	"testing"