From 3a03ac63dc642b0d09f8738d5b45c9526d3e2b23 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@163.com>
Date: Fri, 12 Jul 2024 20:05:14 +0800
Subject: [PATCH] fix: compiling issue

---
 core/apps/api_v2.go                    |  3 +-
 core/apps/utils.go                     | 40 ++++++++++++++++++++++++
 core/grpc/server/options.go            | 43 --------------------------
 core/node/service/master_service_v2.go |  6 ----
 4 files changed, 42 insertions(+), 50 deletions(-)
 create mode 100644 core/apps/utils.go
 delete mode 100644 core/grpc/server/options.go

diff --git a/core/apps/api_v2.go b/core/apps/api_v2.go
index 966b1a08..16fe102c 100644
--- a/core/apps/api_v2.go
+++ b/core/apps/api_v2.go
@@ -7,6 +7,7 @@ import (
 	"github.com/crawlab-team/crawlab/core/controllers"
 	"github.com/crawlab-team/crawlab/core/interfaces"
 	"github.com/crawlab-team/crawlab/core/middlewares"
+	"github.com/crawlab-team/crawlab/core/utils"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/viper"
 	"net"
@@ -73,7 +74,7 @@ func (app *ApiV2) Start() {
 }
 
 func (app *ApiV2) Wait() {
-	DefaultWait()
+	utils.DefaultWait()
 }
 
 func (app *ApiV2) Stop() {
diff --git a/core/apps/utils.go b/core/apps/utils.go
new file mode 100644
index 00000000..25e48c5e
--- /dev/null
+++ b/core/apps/utils.go
@@ -0,0 +1,40 @@
+package apps
+
+import (
+	"fmt"
+	"github.com/apex/log"
+	"github.com/crawlab-team/crawlab/core/utils"
+	"github.com/crawlab-team/crawlab/trace"
+)
+
+func Start(app App) {
+	start(app)
+}
+
+func start(app App) {
+	app.Init()
+	go app.Start()
+	app.Wait()
+	app.Stop()
+}
+
+func DefaultWait() {
+	utils.DefaultWait()
+}
+
+func initModule(name string, fn func() error) (err error) {
+	if err := fn(); err != nil {
+		log.Error(fmt.Sprintf("init %s error: %s", name, err.Error()))
+		_ = trace.TraceError(err)
+		panic(err)
+	}
+	log.Info(fmt.Sprintf("initialized %s successfully", name))
+	return nil
+}
+
+func initApp(name string, app App) {
+	_ = initModule(name, func() error {
+		app.Init()
+		return nil
+	})
+}
diff --git a/core/grpc/server/options.go b/core/grpc/server/options.go
deleted file mode 100644
index afae5dba..00000000
--- a/core/grpc/server/options.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package server
-
-import (
-	"github.com/crawlab-team/crawlab/core/interfaces"
-)
-
-type Option func(svr interfaces.GrpcServer)
-
-func WithConfigPath(path string) Option {
-	return func(svr interfaces.GrpcServer) {
-		svr.SetConfigPath(path)
-	}
-}
-
-func WithAddress(address interfaces.Address) Option {
-	return func(svr interfaces.GrpcServer) {
-		svr.SetAddress(address)
-	}
-}
-
-type NodeServerOption func(svr *NodeServer)
-
-func WithServerNodeServerService(server interfaces.GrpcServer) NodeServerOption {
-	return func(svr *NodeServer) {
-		svr.server = server
-	}
-}
-
-type TaskServerOption func(svr *TaskServer)
-
-func WithServerTaskServerService(server interfaces.GrpcServer) TaskServerOption {
-	return func(svr *TaskServer) {
-		svr.server = server
-	}
-}
-
-type MessageServerOption func(svr *MessageServer)
-
-func WithServerMessageServerService(server interfaces.GrpcServer) MessageServerOption {
-	return func(svr *MessageServer) {
-		svr.server = server
-	}
-}
diff --git a/core/node/service/master_service_v2.go b/core/node/service/master_service_v2.go
index 73f9cf34..196a7448 100644
--- a/core/node/service/master_service_v2.go
+++ b/core/node/service/master_service_v2.go
@@ -327,12 +327,6 @@ func newMasterServiceV2() (res *MasterServiceV2, err error) {
 		stopOnError:     false,
 	}
 
-	// server options
-	var serverOpts []server.Option
-	if svc.address != nil {
-		serverOpts = append(serverOpts, server.WithAddress(svc.address))
-	}
-
 	// node config service
 	svc.cfgSvc = config.GetNodeConfigService()