Commit 2f1d893d authored by ale's avatar ale

Update deps

parent 68704340
Pipeline #696 passed with stages
in 1 minute and 4 seconds
......@@ -70,8 +70,8 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error)
// down remaining clients.
ctx, cancel := context.WithTimeout(context.Background(), gracefulShutdownTimeout)
defer cancel()
if err := srv.Shutdown(ctx); err == context.Canceled {
if err := srv.Close(); err != nil {
if err = srv.Shutdown(ctx); err == context.Canceled {
if err = srv.Close(); err != nil {
log.Printf("error terminating server: %v", err)
}
}
......@@ -80,7 +80,12 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error)
}()
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
if err := srv.ListenAndServe(); err != http.ErrServerClosed {
if tlsConfig != nil {
err = srv.ListenAndServeTLS("", "")
} else {
err = srv.ListenAndServe()
}
if err != http.ErrServerClosed {
return err
}
......
......@@ -5,32 +5,32 @@
{
"checksumSHA1": "raJx5BjBbVQG0ylGSjPpi+JvqjU=",
"path": "git.autistici.org/ai3/go-common",
"revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e",
"revisionTime": "2017-12-11T08:01:45Z"
"revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
"revisionTime": "2017-12-14T07:42:45Z"
},
{
"checksumSHA1": "2X2UMundICtpGTb8pTdBk7PCKss=",
"path": "git.autistici.org/ai3/go-common/clientutil",
"revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e",
"revisionTime": "2017-12-11T08:01:45Z"
"revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
"revisionTime": "2017-12-14T07:42:45Z"
},
{
"checksumSHA1": "3bComZxAfgnoTG4UDlyFgLyeykc=",
"checksumSHA1": "g6I5506EXkjQetiXSYbVTypDnDM=",
"path": "git.autistici.org/ai3/go-common/serverutil",
"revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e",
"revisionTime": "2017-12-11T08:01:45Z"
"revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
"revisionTime": "2017-12-14T07:42:45Z"
},
{
"checksumSHA1": "Br4iXxLFs+Yp7doAZQUccQA/su4=",
"path": "git.autistici.org/id/auth",
"revision": "c856639da0e714f8b4c5b6b299a21a30113217df",
"revisionTime": "2017-12-10T11:12:33Z"
"revision": "ddba7d73598682b17e4683f5a3873f12e158c679",
"revisionTime": "2017-12-13T22:22:39Z"
},
{
"checksumSHA1": "48njEQBB73cV6tTPBEOnzSVRjeA=",
"path": "git.autistici.org/id/auth/client",
"revision": "c856639da0e714f8b4c5b6b299a21a30113217df",
"revisionTime": "2017-12-10T11:12:33Z"
"revision": "ddba7d73598682b17e4683f5a3873f12e158c679",
"revisionTime": "2017-12-13T22:22:39Z"
},
{
"checksumSHA1": "usT4LCSQItkFvFOQT7cBlkCuGaE=",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment