Merge 06ef63f into 1a3f275

cloudwego · Aug 25, 2022 · a3ad012 · a3ad012
2 parents 1a3f275 + 06ef63f
commit a3ad012
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/pkg/app/server/hertz.go b/pkg/app/server/hertz.go
@@ -57,7 +57,6 @@ func Default(opts ...config.Option) *Hertz {
 func (h *Hertz) Spin() {
 	errCh := make(chan error)
 	h.initOnRunHooks(errCh)
-	h.initOnShutdownHooks()
 	go func() {
 		errCh <- h.Run()
 	}()
@@ -133,13 +132,3 @@ func (h *Hertz) initOnRunHooks(errChan chan error) {
 		return nil
 	})
 }
-
-func (h *Hertz) initOnShutdownHooks() {
-	opt := h.GetOptions()
-	// add deregister func to shutdownHooks
-	h.OnShutdown = append(h.OnShutdown, func(ctx context.Context) {
-		if err := opt.Registry.Deregister(opt.RegistryInfo); err != nil {
-			hlog.Errorf("HERTZ: Deregister error=%v", err)
-		}
-	})
-}
diff --git a/pkg/route/engine.go b/pkg/route/engine.go
@@ -271,6 +271,14 @@ func (engine *Engine) Shutdown(ctx context.Context) (err error) {
 		}(i)
 	}
 
+	opt := engine.options
+	if opt.Registry != nil {
+		if err = opt.Registry.Deregister(opt.RegistryInfo); err != nil {
+			hlog.Errorf("HERTZ: Deregister error=%v", err)
+			return err
+		}
+	}
+
 	// call transport shutdown
 	if err := engine.transport.Shutdown(ctx); err != ctx.Err() {
 		return err