Skip to content

fix(serve): graceful shutdown on SIGTERM/SIGINT (exit 0) #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebglon wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −1
Open

fix(serve): graceful shutdown on SIGTERM/SIGINT (exit 0) #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion aws_signing_helper/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package aws_signing_helper

import (
"context"
"crypto/rand"
"encoding/base64"
"encoding/json"
Expand All @@ -11,9 +12,11 @@ import (
"net"
"net/http"
"os"
"os/signal"
"strconv"
"strings"
"sync"
"syscall"
"time"

"github.com/aws/aws-sdk-go-v2/aws/arn"
Expand Down Expand Up @@ -351,7 +354,22 @@ func Serve(port int, credentialsOptions CredentialsOpts) {
log.Println("Local server started on port:", endpoint.PortNum)
log.Println("Make it available to the sdk by running:")
log.Printf("export AWS_EC2_METADATA_SERVICE_ENDPOINT=http://%s:%d/", LocalHostAddress, endpoint.PortNum)
if err := endpoint.Server.Serve(listener); err != nil {

// Graceful shutdown on SIGTERM/SIGINT
quit := make(chan os.Signal, 1)
signal.Notify(quit, syscall.SIGTERM, syscall.SIGINT)
go func() {
<-quit
log.Println("Shutting down server...")
ticker.Stop()
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if err := endpoint.Server.Shutdown(ctx); err != nil {
log.Println("Server forced to shutdown:", err)
}
}()

if err := endpoint.Server.Serve(listener); err != nil && err != http.ErrServerClosed {
log.Println("Httpserver: ListenAndServe() error")
os.Exit(1)
}
Expand Down