TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-08-25 03:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into switch-to-db-d

Browse Source
This commit is contained in:
Juan Font
2022-08-11 13:11:38 +02:00
committed by GitHub
parent d586b9d285 6c8445988c
commit 8e56d8b425
16 changed files with 190 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app.go
View File

@@ -692,7 +692,10 @@ func (h *Headscale) Serve() error {
h.pollNetMapStreamWG.Wait()
// Gracefully shut down servers
ctx, cancel := context.WithTimeout(context.Background(), HTTPShutdownTimeout)
ctx, cancel := context.WithTimeout(
context.Background(),
HTTPShutdownTimeout,
)
if err := promHTTPServer.Shutdown(ctx); err != nil {
log.Error().Err(err).Msg("Failed to shutdown prometheus http")
}
@@ -819,7 +822,10 @@ func (h *Headscale) setLastStateChangeToNow(namespaces ...string) {
if len(namespaces) == 0 {
namespaces, err = h.ListNamespacesStr()
if err != nil {
log.Error().Caller().Err(err).Msg("failed to fetch all namespaces, failing to update last changed state.")
log.Error().
Caller().
Err(err).
Msg("failed to fetch all namespaces, failing to update last changed state.")
}
}