Skip to content

Graceful shutdown for ocsp server #817

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

Closed
wants to merge 1 commit into from
Closed

Graceful shutdown for ocsp server #817

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
44 changes: 42 additions & 2 deletions cli/ocspserve/ocspserve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ import (
"errors"
"fmt"
"net/http"

"github.com/cloudflare/cfssl/cli"
"github.com/cloudflare/cfssl/log"
"github.com/cloudflare/cfssl/ocsp"
"os"
"os/signal"
"syscall"
"time"
"context"
)

// Usage text of 'cfssl serve'
Expand Down Expand Up @@ -41,11 +45,47 @@ func ocspServerMain(args []string, c cli.Config) error {
}

log.Info("Registering OCSP responder handler")

http.Handle(c.Path, ocsp.NewResponder(src))

addr := fmt.Sprintf("%s:%d", c.Address, c.Port)
server := &http.Server{Addr: addr, Handler: nil}

log.Info("Now listening on ", addr)
return http.ListenAndServe(addr, nil)

//gracefull shutdown on SIGTERM or SIGINT
//see issue https://github.com/golang/go/issues/19541
//see https://play.golang.org/p/LdXUYyzDxY
exit := make(chan struct{})
quit := make(chan os.Signal)
signal.Notify(quit, syscall.SIGTERM)
signal.Notify(quit, syscall.SIGINT)
go func() {
defer func() {
if err := recover(); err != nil {
log.Infof("recovered: %+v\n", err)
}
}()
<-quit
d := time.Now().Add(5 * time.Second) // deadline 5s max
ctx, cancel := context.WithDeadline(context.Background(), d)

defer cancel()

log.Info("Shutting down server...")
if err := server.Shutdown(ctx); err != nil {
log.Fatalf("could not shutdown: %v", err)
}
close(exit)
}()
err = server.ListenAndServe()
<-exit
if err != http.ErrServerClosed {
log.Fatalf("listen: %s\n", err)
return err
} else {
return nil
}
}

// Command assembles the definition of Command 'ocspserve'
Expand Down