check error on app.go

topfreegames · Aug 14, 2018 · a6600ef · a6600ef
1 parent b5fc6b6
commit a6600ef
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/app.go b/app.go
@@ -338,9 +338,18 @@ func Start() {
 			app.serviceDiscovery.AddListener(app.rpcClient.(*cluster.GRPCClient))
 		}
 
-		RegisterModuleBefore(app.serviceDiscovery, "serviceDiscovery")
-		RegisterModuleBefore(app.rpcServer, "rpcServer")
-		RegisterModuleBefore(app.rpcClient, "rpcClient")
+		err := RegisterModuleBefore(app.serviceDiscovery, "serviceDiscovery")
+		if err != nil {
+			logger.Log.Fatal("failed to register service discovery module: %s", err.Error())
+		}
+		err = RegisterModuleBefore(app.rpcServer, "rpcServer")
+		if err != nil {
+			logger.Log.Fatal("failed to register rpc server module: %s", err.Error())
+		}
+		err = RegisterModuleBefore(app.rpcClient, "rpcClient")
+		if err != nil {
+			logger.Log.Fatal("failed to register rpc client module: %s", err.Error())
+		}
 
 		app.router.SetServiceDiscovery(app.serviceDiscovery)
 

diff --git a/module_test.go b/module_test.go
@@ -86,10 +86,14 @@ func TestStartupModules(t *testing.T) {
 	resetModules()
 	Configure(true, "testtype", Standalone, map[string]string{}, viper.New())
 
-	RegisterModule(&MyMod{name: "mod1"}, "mod1")
-	RegisterModuleBefore(&MyMod{name: "mod2"}, "mod2")
-	RegisterModuleBefore(&MyMod{name: "mod3"}, "mod3")
-	RegisterModuleAfter(&MyMod{name: "mod4"}, "mod4")
+	err := RegisterModule(&MyMod{name: "mod1"}, "mod1")
+	assert.NoError(t, err)
+	err = RegisterModuleBefore(&MyMod{name: "mod2"}, "mod2")
+	assert.NoError(t, err)
+	err = RegisterModuleBefore(&MyMod{name: "mod3"}, "mod3")
+	assert.NoError(t, err)
+	err = RegisterModuleAfter(&MyMod{name: "mod4"}, "mod4")
+	assert.NoError(t, err)
 
 	startModules()
 	assert.Equal(t, true, modulesMap["mod1"].(*MyMod).running)
@@ -104,10 +108,15 @@ func TestShutdownModules(t *testing.T) {
 	initApp()
 	Configure(true, "testtype", Standalone, map[string]string{}, viper.New())
 
-	RegisterModule(&MyMod{name: "mod1"}, "mod1")
-	RegisterModuleBefore(&MyMod{name: "mod2"}, "mod2")
-	RegisterModuleBefore(&MyMod{name: "mod3"}, "mod3")
-	RegisterModuleAfter(&MyMod{name: "mod4"}, "mod4")
+	err := RegisterModule(&MyMod{name: "mod1"}, "mod1")
+	assert.NoError(t, err)
+	err = RegisterModuleBefore(&MyMod{name: "mod2"}, "mod2")
+	assert.NoError(t, err)
+	err = RegisterModuleBefore(&MyMod{name: "mod3"}, "mod3")
+	assert.NoError(t, err)
+	err = RegisterModuleAfter(&MyMod{name: "mod4"}, "mod4")
+	assert.NoError(t, err)
+
 	startModules()
 
 	modulesOrder = []string{}