Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions echo_go18.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// +build go1.8

package echo

import (
c "context"
)

// Close immediately stops server
// equivalent of func (*http.Server) Close() error
func (e *Echo) Close() error {
if err := e.TLSServer.Close(); err != nil {
return err
}
return e.Server.Close()
}

// Shutdown stops server gracefully
// equivalent of func (*http.Server) Shutdown(ctx context.Context) error
func (e *Echo) Shutdown(ctx c.Context) error {
if err := e.TLSServer.Shutdown(ctx); err != nil {
return err
}
return e.Server.Shutdown(ctx)
}
30 changes: 30 additions & 0 deletions echo_go18_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// +build go1.8

package echo

import (
"testing"
"time"

"github.com/stretchr/testify/assert"
)

func TestEchoClose(t *testing.T) {
e := New()
errCh := make(chan error)

go func() {
errCh <- e.Start(":0")
}()

time.Sleep(200 * time.Millisecond)

if err := e.Close(); err != nil {
t.Fatal(err)
}

assert.NoError(t, e.Close())

err := <-errCh
assert.Equal(t, err.Error(), "http: Server closed")
}