atune: fix the error that check the fixed port of the rest service

cmd/atuned/atuned.go

@@ -187,7 +187,7 @@ func runatuned(ctx *cli.Context) error {
 		return err
 	}
 
-	if err := utils.WaitForPyservice(); err != nil {
+	if err := utils.WaitForPyservice(config.LocalHost, config.RestPort); err != nil {
 		log.Errorf("waiting for pyservice faild: %v", err)
 		return err
 	}

common/project/projet.go

@@ -175,4 +175,3 @@ func ExecCommand(script string) ([]byte, error) {
 	out, err := cmd.CombinedOutput()
 	return out, err
 }
-

common/service/monitor/monitors.go

@@ -48,7 +48,7 @@ func (m *Monitor) Set(cfg *config.Cfg) {
 
 // Run method start the monitor service
 func (m *Monitor) Run() error {
-	if err := utils.WaitForPyservice(); err != nil {
+	if err := utils.WaitForPyservice(config.LocalHost, config.RestPort); err != nil {
 		log.Errorf("waiting for pyservice faild: %v", err)
 		return err
 	}

common/service/service.go

@@ -149,4 +149,3 @@ func CheckRpcIsLocalAddr(ctx context.Context) (bool, error) {
 	}
 	return false, nil
 }
-

common/service/timer/timer.go

@@ -53,7 +53,7 @@ func (t *Timer) Set(cfg *config.Cfg) {
 //Run method start the ticker, auto-tuning the system
 func (t *Timer) Run() error {
 	/* Static & Dynamic judge */
-	if err := utils.WaitForPyservice(); err != nil {
+	if err := utils.WaitForPyservice(config.LocalHost, config.RestPort); err != nil {
 		log.Errorf("waiting for pyservice faild: %v", err)
 		return err
 	}

common/tuning/optimizer.go

@@ -301,4 +301,3 @@ func CheckServerPrj(data string, optimizer *Optimizer) error {
 
 	return fmt.Errorf("project:%s not found", data)
 }
-

common/utils/utils.go

@@ -59,6 +59,12 @@ const (
 	UNKNOWN = "UNKNOWN"
 )
 
+// config for waiting rest service
+const (
+	period  = 2
+	timeout = 120
+)
+
 // CheckArgs method check command args num
 func CheckArgs(context *cli.Context, expected, checkType int) error {
 	var err error
@@ -229,13 +235,14 @@ func RemoveDuplicateElement(message []string) []string {
 }
 
 // WaitForPyservice method waiting for pyEngine service start success
-func WaitForPyservice() error {
-	ticker := time.NewTicker(time.Second * 2)
-	timeout := time.After(time.Second * 120)
+func WaitForPyservice(address string, port string) error {
+	ticker := time.NewTicker(time.Second * period)
+	timeout := time.After(time.Second * timeout)
+	addr := address + ":" + port
 	for {
 		select {
 		case <-ticker.C:
-			_, err := net.Dial("tcp", "localhost:8383")
+			_, err := net.Dial("tcp", addr)
 			if err != nil {
 				continue
 			}
@@ -354,4 +361,3 @@ func CreateDir(dir string, perm os.FileMode) error {
 	}
 	return nil
 }
-