[rocketmq] branch develop updated: [ISSUE #4698] NamesrvStartup code optimize (#4715)

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new b7ec511cc [ISSUE #4698] NamesrvStartup code optimize (#4715)
b7ec511cc is described below

commit b7ec511ccd1ae4b5275c60b411d1a0fe44a02a7c
Author: mxsm <ljbm...@gmail.com>
AuthorDate: Fri Aug 5 08:55:22 2022 +0800

    [ISSUE #4698] NamesrvStartup code optimize (#4715)
---
 .../apache/rocketmq/namesrv/NamesrvStartup.java    | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git 
a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java 
b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
index b85b986ed..43a738b16 100644
--- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
+++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
@@ -55,28 +55,32 @@ public class NamesrvStartup {
     private static ControllerConfig controllerConfig = null;
 
     public static void main(String[] args) {
+        main0(args);
+        controllerManagerMain();
+    }
+
+    public static NamesrvController main0(String[] args) {
         try {
             parseCommandlineAndConfigFile(args);
-            createAndStartNamesrvController();
-            if (namesrvConfig.isEnableControllerInNamesrv()) {
-                createAndStartControllerManager();
-            }
+            NamesrvController controller = createAndStartNamesrvController();
+            return controller;
         } catch (Throwable e) {
             e.printStackTrace();
             System.exit(-1);
         }
+
+        return null;
     }
 
-    public static NamesrvController main0(String[] args) {
+    public static ControllerManager controllerManagerMain() {
         try {
-            parseCommandlineAndConfigFile(args);
-            NamesrvController controller = createAndStartNamesrvController();
-            return controller;
+            if (namesrvConfig.isEnableControllerInNamesrv()) {
+                return createAndStartControllerManager();
+            }
         } catch (Throwable e) {
             e.printStackTrace();
             System.exit(-1);
         }
-
         return null;
     }