new logger and etcd fixes
This commit is contained in:
parent
ba001b4c20
commit
cbd4f38cca
11 changed files with 248 additions and 161 deletions
|
|
@ -27,16 +27,17 @@ func NewLBController(cfg *config.Config, srv *api.Server, log logr.Logger) (call
|
|||
callbacks = cluster.Callbacks{
|
||||
Leader: func(ctx context.Context, cc cluster.CallbackContext) {
|
||||
db := db.New(cc)
|
||||
cc.V(2).Info("starting haproxy", "service", cfg.HAProxyService)
|
||||
log := cc.Logger()
|
||||
log.Info("starting haproxy", "service", cfg.HAProxyService)
|
||||
err := ha.Start(ctx)
|
||||
if err != nil {
|
||||
cc.Error(err, "error starting haproxy")
|
||||
log.Error(err, "error starting haproxy")
|
||||
cc.Fatal(err)
|
||||
return
|
||||
}
|
||||
err = srv.UpdateDB(db)
|
||||
if err != nil {
|
||||
cc.Error(err, "error initialising api server as leader")
|
||||
log.Error(err, "error initialising api server as leader")
|
||||
cc.Fatal(err)
|
||||
return
|
||||
}
|
||||
|
|
@ -45,56 +46,61 @@ func NewLBController(cfg *config.Config, srv *api.Server, log logr.Logger) (call
|
|||
go func() {
|
||||
err := exec.CommandContext(ctx, cfg.LeaderHook).Run()
|
||||
if err != nil {
|
||||
cc.Error(err, "error running hook", "leaderHook", cfg.LeaderHook)
|
||||
log.Error(err, "error running hook", "leaderHook", cfg.LeaderHook)
|
||||
}
|
||||
}()
|
||||
}
|
||||
for {
|
||||
cc.Info("leading", "id", cc.ID())
|
||||
if ctx.Err() == context.Canceled {
|
||||
t.Stop()
|
||||
log.Info("leading canceled", "id", cc.ID())
|
||||
return
|
||||
}
|
||||
log.Info("leading", "id", cc.ID())
|
||||
ips, err := db.GetDeletedIPs()
|
||||
if err != nil && err != cluster.ErrPrefixNotFound {
|
||||
cc.Error(err, "error reading deleted ips list")
|
||||
log.Error(err, "error reading deleted ips list")
|
||||
<-t.C
|
||||
continue
|
||||
}
|
||||
deleteIPs(cc, n, ips)
|
||||
deleteIPs(log, n, ips)
|
||||
|
||||
ips, err = db.GetIPs()
|
||||
if err != nil && err != cluster.ErrPrefixNotFound {
|
||||
cc.Error(err, "error reading ips list")
|
||||
log.Error(err, "error reading ips list")
|
||||
<-t.C
|
||||
continue
|
||||
}
|
||||
addIPs(cc, n, ips)
|
||||
addIPs(log, n, ips)
|
||||
|
||||
lbs, err := db.GetLBs("")
|
||||
if err != nil && err != cluster.ErrPrefixNotFound {
|
||||
cc.Error(err, "error reading lb list")
|
||||
log.Error(err, "error reading lb list")
|
||||
<-t.C
|
||||
continue
|
||||
}
|
||||
lbcfg, err := haproxy.NewConfig(lbs)
|
||||
if err != nil {
|
||||
cc.Error(err, "error reading haproxy config")
|
||||
log.Error(err, "error reading haproxy config")
|
||||
<-t.C
|
||||
continue
|
||||
}
|
||||
err = ha.UpdateConfig(ctx, lbcfg)
|
||||
if err != nil {
|
||||
cc.Error(err, "error updating haproxy config")
|
||||
log.Error(err, "error updating haproxy config")
|
||||
<-t.C
|
||||
continue
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
t.Stop()
|
||||
deleteIPs(cc, n, ips)
|
||||
cc.V(2).Info("stopping haproxy", "service", cfg.HAProxyService)
|
||||
deleteIPs(log, n, ips)
|
||||
log.Info("stopping haproxy", "service", cfg.HAProxyService)
|
||||
err = ha.Stop(context.Background())
|
||||
if err != nil {
|
||||
cc.Error(err, "error stopping haproxy")
|
||||
log.Error(err, "error stopping haproxy")
|
||||
}
|
||||
cc.Info("leading canceled", "id", cc.ID())
|
||||
log.Info("leading canceled", "id", cc.ID())
|
||||
return
|
||||
case <-t.C:
|
||||
}
|
||||
|
|
@ -102,9 +108,10 @@ func NewLBController(cfg *config.Config, srv *api.Server, log logr.Logger) (call
|
|||
},
|
||||
Follower: func(ctx context.Context, cc cluster.CallbackContext) {
|
||||
db := db.New(cc)
|
||||
log := cc.Logger()
|
||||
err := srv.UpdateDB(db)
|
||||
if err != nil {
|
||||
cc.Error(err, "error initialising api server as follower")
|
||||
log.Error(err, "error initialising api server as follower")
|
||||
cc.Fatal(err)
|
||||
return
|
||||
}
|
||||
|
|
@ -113,23 +120,28 @@ func NewLBController(cfg *config.Config, srv *api.Server, log logr.Logger) (call
|
|||
go func() {
|
||||
err := exec.CommandContext(ctx, cfg.FollowerHook).Run()
|
||||
if err != nil {
|
||||
cc.Error(err, "error running hook", "followerHook", cfg.FollowerHook)
|
||||
log.Error(err, "error running hook", "followerHook", cfg.FollowerHook)
|
||||
}
|
||||
}()
|
||||
}
|
||||
for {
|
||||
cc.Info("following", "id", cc.ID())
|
||||
if ctx.Err() == context.Canceled {
|
||||
t.Stop()
|
||||
log.Info("following canceled", "id", cc.ID())
|
||||
return
|
||||
}
|
||||
log.Info("following", "id", cc.ID())
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
t.Stop()
|
||||
cc.Info("following canceled", "id", cc.ID())
|
||||
log.Info("following canceled", "id", cc.ID())
|
||||
return
|
||||
case <-t.C:
|
||||
}
|
||||
}
|
||||
},
|
||||
Cleanup: func(ctx context.Context, cc cluster.CallbackContext) {
|
||||
deleteIPs(cc, n, n.GetIPs())
|
||||
deleteIPs(log, n, n.GetIPs())
|
||||
},
|
||||
}
|
||||
return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue