Merge pull request #7771 from onflow/codex/fix-issue-7765-in-flow-go

[Admin] Fix hang during admin server shutdown

Author: peterargue

admin/command_runner.go

@@ -284,8 +284,16 @@ func (r *CommandRunner) runAdminServer(ctx irrecoverable.SignalerContext) error
 			defer shutdownCancel()
 
 			if err := httpServer.Shutdown(shutdownCtx); err != nil {
-				r.logger.Err(err).Msg("failed to shutdown http server")
-				ctx.Throw(err)
+				if errors.Is(err, context.DeadlineExceeded) {
+					r.logger.Warn().Err(err).Msg("failed to shutdown http server gracefully; forcing close")
+					if closeErr := httpServer.Close(); closeErr != nil {
+						r.logger.Err(closeErr).Msg("failed to force close http server")
+						ctx.Throw(closeErr)
+					}
+				} else {
+					r.logger.Err(err).Msg("failed to shutdown http server")
+					ctx.Throw(err)
+				}
 			}
 		}
 	}()