Skip to content
Snippets Groups Projects
Commit 6b0e6d9b authored by ale's avatar ale
Browse files

Update deps

parent 29e07bac
No related branches found
No related tags found
No related merge requests found
...@@ -70,8 +70,8 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error) ...@@ -70,8 +70,8 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error)
// down remaining clients. // down remaining clients.
ctx, cancel := context.WithTimeout(context.Background(), gracefulShutdownTimeout) ctx, cancel := context.WithTimeout(context.Background(), gracefulShutdownTimeout)
defer cancel() defer cancel()
if err := srv.Shutdown(ctx); err == context.Canceled { if err = srv.Shutdown(ctx); err == context.Canceled {
if err := srv.Close(); err != nil { if err = srv.Close(); err != nil {
log.Printf("error terminating server: %v", err) log.Printf("error terminating server: %v", err)
} }
} }
...@@ -80,7 +80,12 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error) ...@@ -80,7 +80,12 @@ func Serve(h http.Handler, serverConfig *ServerConfig, addr string) (err error)
}() }()
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM) 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 return err
} }
......
...@@ -5,26 +5,26 @@ ...@@ -5,26 +5,26 @@
{ {
"checksumSHA1": "raJx5BjBbVQG0ylGSjPpi+JvqjU=", "checksumSHA1": "raJx5BjBbVQG0ylGSjPpi+JvqjU=",
"path": "git.autistici.org/ai3/go-common", "path": "git.autistici.org/ai3/go-common",
"revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e", "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
"revisionTime": "2017-12-11T08:01:45Z" "revisionTime": "2017-12-14T07:42:45Z"
}, },
{ {
"checksumSHA1": "2X2UMundICtpGTb8pTdBk7PCKss=", "checksumSHA1": "2X2UMundICtpGTb8pTdBk7PCKss=",
"path": "git.autistici.org/ai3/go-common/clientutil", "path": "git.autistici.org/ai3/go-common/clientutil",
"revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e", "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
"revisionTime": "2017-12-11T08:01:45Z" "revisionTime": "2017-12-14T07:42:45Z"
}, },
{ {
"checksumSHA1": "mEnXMNziH82HFtGngHU19VHTVHs=", "checksumSHA1": "mEnXMNziH82HFtGngHU19VHTVHs=",
"path": "git.autistici.org/ai3/go-common/ldap", "path": "git.autistici.org/ai3/go-common/ldap",
"revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e", "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
"revisionTime": "2017-12-11T08:01:45Z" "revisionTime": "2017-12-14T07:42:45Z"
}, },
{ {
"checksumSHA1": "3bComZxAfgnoTG4UDlyFgLyeykc=", "checksumSHA1": "g6I5506EXkjQetiXSYbVTypDnDM=",
"path": "git.autistici.org/ai3/go-common/serverutil", "path": "git.autistici.org/ai3/go-common/serverutil",
"revision": "c2c933578837d28b6f0e9b0b4b183d53ab28785e", "revision": "cd9ee1e6cc35b08a350d3dcb1b331750b363a82d",
"revisionTime": "2017-12-11T08:01:45Z" "revisionTime": "2017-12-14T07:42:45Z"
}, },
{ {
"checksumSHA1": "DFjm2ZJpUwioPApa3htGXLEFWl8=", "checksumSHA1": "DFjm2ZJpUwioPApa3htGXLEFWl8=",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment