diff --git a/vendor/git.autistici.org/ai3/go-common/serverutil/http.go b/vendor/git.autistici.org/ai3/go-common/serverutil/http.go index b1d4b94968edc27e116836d981440d24ebeae60e..81c9ae902ff30237d3a45c33edb7ab12fa809c9a 100644 --- a/vendor/git.autistici.org/ai3/go-common/serverutil/http.go +++ b/vendor/git.autistici.org/ai3/go-common/serverutil/http.go @@ -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 } diff --git a/vendor/vendor.json b/vendor/vendor.json index 8026fa82d78bb30fe6ee5825cc4dcf6c801ea334..ce9de66e8112c68edfc55b6fb159ffa1ba9c1075 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -5,26 +5,26 @@ { "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": "mEnXMNziH82HFtGngHU19VHTVHs=", "path": "git.autistici.org/ai3/go-common/ldap", - "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": "DFjm2ZJpUwioPApa3htGXLEFWl8=",