Merge pull request #97 from Icinga/bugfix/do-not-use-seconds

HA: Do not use seconds in responsibility check
This commit is contained in:
Alexander Aleksandrovič Klimov 2019-12-12 12:03:34 +01:00 committed by GitHub
commit fc72e68fd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -214,7 +214,7 @@ func (h *HA) checkResponsibility(env *Environment) {
return
}
if time.Now().Unix()-beat > 15*1000 {
if utils.TimeToMillisecs(time.Now())-beat > 15*1000 {
h.logger.Info("Taking over.")
// This means there was no instance row match, insert

View file

@ -101,7 +101,7 @@ func TestHA_checkResponsibility(t *testing.T) {
_, err = ha.super.Dbw.SqlExec(
mysqlObservers.insertIntoIcingadbInstance,
"INSERT INTO icingadb_instance(id, environment_id, heartbeat, responsible, icinga2_version, icinga2_start_time) VALUES (?, ?, ?, 'y', '', 0)",
ha.uid[:], ha.super.EnvId, time.Now().Unix(),
ha.uid[:], ha.super.EnvId, utils.TimeToMillisecs(time.Now()),
)
ha.isActive = false