Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

internal/startrpc/start.go

@@ -59,11 +59,16 @@ func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(c
 			}
 		}
 	}()
+
+	err = rpcFn(zkClient, srv)
+	if err != nil {
+		return utils.Wrap1(err)
+	}
 	err = srv.Serve(listener)
 	if err != nil {
 		return utils.Wrap1(err)
 	}
-	return rpcFn(zkClient, srv)
+	return nil
 }
 
 //func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error {

pkg/common/mw/rpc.go

@@ -64,10 +64,13 @@ func rpcClientInterceptor(ctx context.Context, method string, req, reply interfa
 	if ok {
 		md.Append(constant.OpUserID, opUserID)
 	}
+	log.Info("", "rpc come here")
 	err = invoker(metadata.NewOutgoingContext(ctx, md), method, req, reply, cc, opts...)
 	if err == nil {
 		return nil
 	}
+	log.Info("", "rpc come here err")
+
 	rpcErr, ok := err.(interface{ GRPCStatus() *status.Status })
 	if !ok {
 		return errs.NewCodeError(errs.DefaultOtherError, err.Error()).Wrap()