@@ -732,7 +732,7 @@ func (e *Echo) StartServer(s *http.Server) (err error) {
732
732
return s .Serve (e .Listener )
733
733
}
734
734
735
- func (e * Echo ) configureServer (s * http.Server ) ( err error ) {
735
+ func (e * Echo ) configureServer (s * http.Server ) error {
736
736
// Setup
737
737
e .colorer .SetOutput (e .Logger .Output ())
738
738
s .ErrorLog = e .StdLogger
@@ -747,10 +747,11 @@ func (e *Echo) configureServer(s *http.Server) (err error) {
747
747
748
748
if s .TLSConfig == nil {
749
749
if e .Listener == nil {
750
- e . Listener , err = newListener (s .Addr , e .ListenerNetwork )
750
+ listener , err : = newListener (s .Addr , e .ListenerNetwork )
751
751
if err != nil {
752
752
return err
753
753
}
754
+ e .Listener = listener
754
755
}
755
756
if ! e .HidePort {
756
757
e .colorer .Printf ("⇨ http server started on %s\n " , e .colorer .Green (e .Listener .Addr ()))
@@ -791,7 +792,7 @@ func (e *Echo) TLSListenerAddr() net.Addr {
791
792
}
792
793
793
794
// StartH2CServer starts a custom http/2 server with h2c (HTTP/2 Cleartext).
794
- func (e * Echo ) StartH2CServer (address string , h2s * http2.Server ) ( err error ) {
795
+ func (e * Echo ) StartH2CServer (address string , h2s * http2.Server ) error {
795
796
e .startupMutex .Lock ()
796
797
// Setup
797
798
s := e .Server
@@ -808,11 +809,12 @@ func (e *Echo) StartH2CServer(address string, h2s *http2.Server) (err error) {
808
809
}
809
810
810
811
if e .Listener == nil {
811
- e . Listener , err = newListener (s .Addr , e .ListenerNetwork )
812
+ l , err : = newListener (s .Addr , e .ListenerNetwork )
812
813
if err != nil {
813
814
e .startupMutex .Unlock ()
814
815
return err
815
816
}
817
+ e .Listener = l
816
818
}
817
819
if ! e .HidePort {
818
820
e .colorer .Printf ("⇨ http server started on %s\n " , e .colorer .Green (e .Listener .Addr ()))
0 commit comments