熔断consumer错误判断增加response的状态判断 (#106)

* 熔断错误判断 * 熔断错误判断 * 熔断判断 + 限流反注册 * resp close Co-authored-by: zhanglei25 <[email protected]>
polarismesh · Nov 2, 2022 · d7cc5a1 · d7cc5a1
1 parent 3046b5e
commit d7cc5a1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/examples/circuitbreaker/consumer/main.go b/examples/circuitbreaker/consumer/main.go
@@ -75,7 +75,11 @@ func (svr *PolarisConsumer) runWebServer() {
 
 			start := time.Now()
 			resp, err := http.Get(fmt.Sprintf("http://%s:%d/echo", instance.GetHost(), instance.GetPort()))
-			if err != nil {
+			if resp != nil {
+				defer resp.Body.Close()
+			}
+
+			if err != nil || resp.StatusCode != http.StatusOK {
 				delay := time.Now().Sub(start)
 				callRet := &polaris.ServiceCallResult{}
 				callRet.CalledInstance = instance
@@ -97,8 +101,6 @@ func (svr *PolarisConsumer) runWebServer() {
 				continue
 			}
 
-			defer resp.Body.Close()
-
 			data, err := ioutil.ReadAll(resp.Body)
 			if err != nil {
 				log.Printf("[error] read resp from %s:%d fail : %s", instance.GetHost(), instance.GetPort(), err)

diff --git a/examples/ratelimit/provider/main.go b/examples/ratelimit/provider/main.go
@@ -132,7 +132,21 @@ func (svr *PolarisProvider) registerService() {
 	log.Printf("register response: instanceId %s", resp.InstanceID)
 }
 
-func runMainLoop() {
+func (svr *PolarisProvider) deregisterService() {
+	log.Printf("start to invoke deregister operation")
+	deregisterRequest := &polaris.InstanceDeRegisterRequest{}
+	deregisterRequest.Service = service
+	deregisterRequest.Namespace = namespace
+	deregisterRequest.Host = svr.host
+	deregisterRequest.Port = svr.port
+	deregisterRequest.ServiceToken = token
+	if err := svr.provider.Deregister(deregisterRequest); err != nil {
+		log.Fatalf("fail to deregister instance, err is %v", err)
+	}
+	log.Printf("deregister successfully.")
+}
+
+func (svr *PolarisProvider) runMainLoop() {
 	ch := make(chan os.Signal, 1)
 	signal.Notify(ch, []os.Signal{
 		syscall.SIGINT, syscall.SIGTERM,
@@ -176,7 +190,7 @@ func main() {
 
 	svr.Run()
 
-	runMainLoop()
+	svr.runMainLoop()
 }
 
 func getLocalHost(serverAddr string) (string, error) {