Add web auth, infinite-scroll, agent admission and review fixes across agent/server/web
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/monlet/agent/internal/agentkey"
|
||||
"github.com/monlet/agent/internal/app"
|
||||
@@ -20,6 +21,13 @@ import (
|
||||
|
||||
var version = "0.1.0"
|
||||
|
||||
const shutdownTimeout = 30 * time.Second
|
||||
|
||||
type reloadTarget interface {
|
||||
RecordReloadFailure()
|
||||
Reload(*config.Config, string) error
|
||||
}
|
||||
|
||||
func main() {
|
||||
cfgPath := flag.String("config", "config.toml", "path to TOML config")
|
||||
flag.Parse()
|
||||
@@ -65,6 +73,12 @@ func main() {
|
||||
|
||||
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer cancel()
|
||||
startShutdownWatchdog(ctx, shutdownTimeout, log, os.Exit)
|
||||
|
||||
hup := make(chan os.Signal, 1)
|
||||
signal.Notify(hup, syscall.SIGHUP)
|
||||
defer signal.Stop(hup)
|
||||
go runReloadLoop(ctx, *cfgPath, hup, a, log)
|
||||
|
||||
log.Info("monlet-agent starting", "agent_id", agentID, "version", version, "checks", len(cfg.Checks))
|
||||
if err := a.Run(ctx); err != nil {
|
||||
@@ -73,3 +87,45 @@ func main() {
|
||||
}
|
||||
log.Info("monlet-agent stopped")
|
||||
}
|
||||
|
||||
func startShutdownWatchdog(ctx context.Context, timeout time.Duration, log *slog.Logger, exit func(int)) {
|
||||
go func() {
|
||||
<-ctx.Done()
|
||||
t := time.NewTimer(timeout)
|
||||
defer t.Stop()
|
||||
<-t.C
|
||||
log.Error("shutdown timeout exceeded", "timeout", timeout.String())
|
||||
exit(1)
|
||||
}()
|
||||
}
|
||||
|
||||
func runReloadLoop(ctx context.Context, cfgPath string, hup <-chan os.Signal, target reloadTarget, log *slog.Logger) {
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-hup:
|
||||
reloadOnce(cfgPath, target, log)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func reloadOnce(cfgPath string, target reloadTarget, log *slog.Logger) {
|
||||
nextCfg, err := config.Load(cfgPath)
|
||||
if err != nil {
|
||||
target.RecordReloadFailure()
|
||||
log.Warn("reload config failed", "err", err)
|
||||
return
|
||||
}
|
||||
nextAgentID, err := ids.ResolveAgentID(nextCfg.AgentID, nextCfg.Hostname)
|
||||
if err != nil {
|
||||
target.RecordReloadFailure()
|
||||
log.Warn("reload agent_id failed", "err", err)
|
||||
return
|
||||
}
|
||||
if err := target.Reload(nextCfg, nextAgentID); err != nil {
|
||||
log.Warn("reload rejected", "err", err)
|
||||
return
|
||||
}
|
||||
log.Info("reload complete", "checks", len(nextCfg.Checks))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user