From 0e874501bdb30effb53a449d93f7a0caa0f3d348 Mon Sep 17 00:00:00 2001 From: Jean Flach Date: Fri, 22 Feb 2019 11:14:54 +0100 Subject: [PATCH] Use icingadb_connection redis --- ha.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ha.go b/ha.go index 6550f9f7..cc64c1a4 100644 --- a/ha.go +++ b/ha.go @@ -3,7 +3,6 @@ package icingadb_ha_lib import ( "database/sql" "git.icinga.com/icingadb-connection" - "github.com/go-redis/redis" "github.com/google/uuid" log "github.com/sirupsen/logrus" "sync/atomic" @@ -81,7 +80,7 @@ func (h *HA) IsResponsible() bool { return h.getResponsibility() == TakeoverSync } -func (h *HA) Run(rdb *redis.Client, dbw *icingadb_connection.DBWrapper, chEnv chan *icingadb_connection.Environment, chErr chan error) { +func (h *HA) Run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.DBWrapper, chEnv chan *icingadb_connection.Environment, chErr chan error) { go cleanUpInstancesAsync(dbw, chErr) if errRun := h.run(rdb, dbw, chEnv); errRun != nil { @@ -122,7 +121,7 @@ func cleanUpInstances(dbw *icingadb_connection.DBWrapper) error { return errTx } -func (h *HA) run(rdb *redis.Client, dbw *icingadb_connection.DBWrapper, chEnv chan *icingadb_connection.Environment) error { +func (h *HA) run(rdb *icingadb_connection.RDBWrapper, dbw *icingadb_connection.DBWrapper, chEnv chan *icingadb_connection.Environment) error { log.WithFields(log.Fields{"context": "HA"}).Info("Waiting for Icinga 2 to tell us its environment") var env *icingadb_connection.Environment = nil