lint fix

lion2luo · Jan 2, 2019 · 710abf3 · 710abf3
1 parent 54e28ab
commit 710abf3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/agent.go b/agent.go
@@ -439,7 +439,7 @@ func (a *Agent) availableAllServices() {
 
 func (a *Agent) unavailableAllServices() {
 	a.serviceRegistries.Range(func(k, v interface{}) bool {
-		v.(motan.Registry).Available(nil)
+		v.(motan.Registry).Unavailable(nil)
 		return true
 	})
 }

diff --git a/main/agentdemo.go b/main/agentdemo.go
@@ -24,9 +24,8 @@ func runAgentDemo() {
 			if err != nil {
 				http.Error(writer, fmt.Sprint(err), http.StatusInternalServerError)
 				return
-			} else {
-				fmt.Println(string(rawRequestBytes))
 			}
+			fmt.Println(string(rawRequestBytes))
 		})
 		http.ListenAndServe(addr, handler)
 	}()

diff --git a/main/confsDemo/serverDemo.go b/main/confsDemo/serverDemo.go
@@ -22,9 +22,8 @@ func main() {
 			if err != nil {
 				http.Error(writer, fmt.Sprint(err), http.StatusInternalServerError)
 				return
-			} else {
-				fmt.Println(string(rawRequestBytes))
 			}
+			fmt.Println(string(rawRequestBytes))
 		})
 		http.ListenAndServe(addr, handler)
 	}()

diff --git a/server/httpProxyServer.go b/server/httpProxyServer.go
@@ -201,6 +201,7 @@ func (s *HTTPProxyServer) doHTTPRpcProxy(ctx *fasthttp.RequestCtx, httpCluster *
 		vlog.Errorf("Http rpc proxy call failed: %s", motanResponse.GetException().ErrMsg)
 		ctx.Response.Header.SetServer(HTTPProxyServerName)
 		ctx.Response.Header.SetStatusCode(fasthttp.StatusBadGateway)
+		ctx.Response.SetBodyString("err_msg: " + motanResponse.GetException().ErrMsg)
 		return
 	}
 	// we need process deserialize here, maybe the httpCluster should initialize without proxy as a normal client
@@ -210,7 +211,7 @@ func (s *HTTPProxyServer) doHTTPRpcProxy(ctx *fasthttp.RequestCtx, httpCluster *
 		vlog.Errorf("Deserialize rpc response failed: %s", err.Error())
 		ctx.Response.Header.SetServer(HTTPProxyServerName)
 		ctx.Response.Header.SetStatusCode(fasthttp.StatusBadGateway)
-		ctx.Response.SetBodyString("err_msg: " + motanResponse.GetException().ErrMsg)
+		ctx.Response.SetBodyString("err_msg: " + err.Error())
 		return
 	}
 	if reply[0] != nil {