upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update libs

Browse source
This commit is contained in:
Jean Flach 2019-02-25 14:29:49 +01:00
parent 3ad6315b3a
commit be85da4250
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ha.go
View file

@ -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 = ?`,

2
heartbeat.go
View file

@ -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"
)

2
heartbeat_test.go
View file

@ -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"