[FIX] fix windows_builder topic is not support bug

discover.v2/register.go

@@ -148,10 +148,12 @@ func (k *KeepAlive) Stop() {
 		close(k.Done)
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 		defer cancel()
-		if err := k.gRPCResolver.Update(ctx, k.etcdKey(), naming.Update{Op: naming.Delete, Addr: k.Endpoint}); err != nil {
-			logrus.Errorf("cancel %s server endpoint %s from etcd error %s", k.ServerName, k.Endpoint, err.Error())
-		} else {
-			logrus.Infof("cancel %s server endpoint %s from etcd", k.ServerName, k.Endpoint)
+		if k.gRPCResolver != nil {
+			if err := k.gRPCResolver.Update(ctx, k.etcdKey(), naming.Update{Op: naming.Delete, Addr: k.Endpoint}); err != nil {
+				logrus.Errorf("cancel %s server endpoint %s from etcd error %s", k.ServerName, k.Endpoint, err.Error())
+			} else {
+				logrus.Infof("cancel %s server endpoint %s from etcd", k.ServerName, k.Endpoint)
+			}
 		}
 	})
 }

mq/api/mq/mq.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/goodrain/rainbond/cmd/mq/option"
+	"github.com/goodrain/rainbond/mq/client"
 
 	"golang.org/x/net/context"
 
@@ -83,9 +84,9 @@ func (e *etcdQueue) Start() error {
 			e.registerTopic(t)
 		}
 	}
-	e.registerTopic("worker")
-	e.registerTopic("builder")
-	e.registerTopic("windows")
+	e.registerTopic(client.BuilderTopic)
+	e.registerTopic(client.WindowsBuilderTopic)
+	e.registerTopic(client.WorkerTopic)
 	logrus.Info("etcd message queue client started success")
 	return nil
 }