DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Small fixes

Browse source 
* Shut down the web server first to prevent errors caused by clients trying
to use functionality that has already been shut down, causing errors and
potentially delaying the shutdown process.
* remove write timeout from the websocket Write() function.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2025-08-24 08:35:17 +00:00
parent 5a26614acf
commit 86a0b0cf4f
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/garm/main.go
View file

@ -372,6 +372,13 @@ func main() {
<-ctx.Done()
slog.InfoContext(ctx, "shutting down http server")
shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 60*time.Second)
defer shutdownCancel()
if err := srv.Shutdown(shutdownCtx); err != nil {
slog.With(slog.Any("error", err)).ErrorContext(ctx, "graceful api server shutdown failed")
}
if err := cacheWorker.Stop(); err != nil {
slog.With(slog.Any("error", err)).ErrorContext(ctx, "failed to stop credentials worker")
}
@ -386,13 +393,6 @@ func main() {
slog.With(slog.Any("error", err)).ErrorContext(ctx, "failed to stop provider worker")
}
slog.InfoContext(ctx, "shutting down http server")
shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 60*time.Second)
defer shutdownCancel()
if err := srv.Shutdown(shutdownCtx); err != nil {
slog.With(slog.Any("error", err)).ErrorContext(ctx, "graceful api server shutdown failed")
}
slog.With(slog.Any("error", err)).InfoContext(ctx, "waiting for runner to stop")
if err := runner.Wait(); err != nil {
slog.With(slog.Any("error", err)).ErrorContext(ctx, "failed to shutdown workers")

18
websocket/websocket.go
View file

@ -118,23 +118,17 @@ func (h *Hub) Unregister(client *Client) error {
}
func (h *Hub) Write(msg []byte) (int, error) {
h.mux.Lock()
if !h.running {
h.mux.Unlock()
return 0, fmt.Errorf("websocket writer is not running")
}
h.mux.Unlock()
tmp := make([]byte, len(msg))
copy(tmp, msg)
timer := time.NewTimer(5 * time.Second)
defer timer.Stop()
select {
case <-timer.C:
return 0, fmt.Errorf("timed out sending message to client")
case h.broadcast <- tmp:
return len(tmp), nil
case <-h.quit:
return 0, fmt.Errorf("websocket hub is shutting down")
default:
return 0, fmt.Errorf("failed to broadcast over websocket")
}
return len(tmp), nil
}
func (h *Hub) Start() error {