uing pkg module

grace/grace.go

@@ -54,16 +54,22 @@ import (
 
 const (
 	// PreSignal is the position to add filter before signal
+	// Deprecated: using pkg/grace, we will delete this in v2.1.0
 	PreSignal = iota
 	// PostSignal is the position to add filter after signal
+	// Deprecated: using pkg/grace, we will delete this in v2.1.0
 	PostSignal
 	// StateInit represent the application inited
+	// Deprecated: using pkg/grace, we will delete this in v2.1.0
 	StateInit
 	// StateRunning represent the application is running
+	// Deprecated: using pkg/grace, we will delete this in v2.1.0
 	StateRunning
 	// StateShuttingDown represent the application is shutting down
+	// Deprecated: using pkg/grace, we will delete this in v2.1.0
 	StateShuttingDown
 	// StateTerminate represent the application is killed
+	// Deprecated: using pkg/grace, we will delete this in v2.1.0
 	StateTerminate
 )
 
@@ -106,6 +112,7 @@ func init() {
 }
 
 // NewServer returns a new graceServer.
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func NewServer(addr string, handler http.Handler) (srv *Server) {
 	regLock.Lock()
 	defer regLock.Unlock()
@@ -154,12 +161,14 @@ func NewServer(addr string, handler http.Handler) (srv *Server) {
 }
 
 // ListenAndServe refer http.ListenAndServe
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func ListenAndServe(addr string, handler http.Handler) error {
 	server := NewServer(addr, handler)
 	return server.ListenAndServe()
 }
 
 // ListenAndServeTLS refer http.ListenAndServeTLS
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func ListenAndServeTLS(addr string, certFile string, keyFile string, handler http.Handler) error {
 	server := NewServer(addr, handler)
 	return server.ListenAndServeTLS(certFile, keyFile)

grace/server.go

@@ -18,6 +18,7 @@ import (
 )
 
 // Server embedded http.Server
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 type Server struct {
 	*http.Server
 	ln           net.Listener
@@ -32,6 +33,7 @@ type Server struct {
 // Serve accepts incoming connections on the Listener l,
 // creating a new service goroutine for each.
 // The service goroutines read requests and then call srv.Handler to reply to them.
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func (srv *Server) Serve() (err error) {
 	srv.state = StateRunning
 	defer func() { srv.state = StateTerminate }()
@@ -55,6 +57,7 @@ func (srv *Server) Serve() (err error) {
 // ListenAndServe listens on the TCP network address srv.Addr and then calls Serve
 // to handle requests on incoming connections. If srv.Addr is blank, ":http" is
 // used.
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func (srv *Server) ListenAndServe() (err error) {
 	addr := srv.Addr
 	if addr == "" {
@@ -94,6 +97,7 @@ func (srv *Server) ListenAndServe() (err error) {
 // CA's certificate.
 //
 // If srv.Addr is blank, ":https" is used.
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func (srv *Server) ListenAndServeTLS(certFile, keyFile string) (err error) {
 	addr := srv.Addr
 	if addr == "" {
@@ -140,6 +144,7 @@ func (srv *Server) ListenAndServeTLS(certFile, keyFile string) (err error) {
 
 // ListenAndServeMutualTLS listens on the TCP network address srv.Addr and then calls
 // Serve to handle requests on incoming mutual TLS connections.
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func (srv *Server) ListenAndServeMutualTLS(certFile, keyFile, trustFile string) (err error) {
 	addr := srv.Addr
 	if addr == "" {
@@ -340,6 +345,7 @@ func (srv *Server) fork() (err error) {
 }
 
 // RegisterSignalHook registers a function to be run PreSignal or PostSignal for a given signal.
+// Deprecated: using pkg/grace, we will delete this in v2.1.0
 func (srv *Server) RegisterSignalHook(ppFlag int, sig os.Signal, f func()) (err error) {
 	if ppFlag != PreSignal && ppFlag != PostSignal {
 		err = fmt.Errorf("Invalid ppFlag argument. Must be either grace.PreSignal or grace.PostSignal")