fix subhost issue

Signed-off-by: RockyJin <[email protected]> fix testcase issue fix testcase issue fix testcase issue fix testcase issue go format code
lranjbar · Apr 14, 2020 · 094e2ca · 094e2ca
1 parent cfba307
commit 094e2ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/internal/pkg/mqtt/client_options.go b/internal/pkg/mqtt/client_options.go
@@ -62,7 +62,15 @@ type MQTTClientOptions struct {
 
 // CreateMQTTClientConfiguration constructs a MQTTClientConfig based on the provided MessageBusConfig.
 func CreateMQTTClientConfiguration(messageBusConfig types.MessageBusConfig) (MQTTClientConfig, error) {
-	brokerUrl := messageBusConfig.PublishHost.GetHostURL()
+	var brokerUrl string
+	if !messageBusConfig.PublishHost.IsHostInfoEmpty() {
+		brokerUrl = messageBusConfig.PublishHost.GetHostURL()
+	} else if !messageBusConfig.SubscribeHost.IsHostInfoEmpty() {
+		brokerUrl = messageBusConfig.SubscribeHost.GetHostURL()
+	} else {
+		return MQTTClientConfig{}, fmt.Errorf("Specified empty broker info.")
+	}
+
 	_, err := url.Parse(brokerUrl)
 	if err != nil {
 		return MQTTClientConfig{}, pkg.NewBrokerURLErr(fmt.Sprintf("Failed to parse broker: %v", err))

diff --git a/internal/pkg/mqtt/client_test.go b/internal/pkg/mqtt/client_test.go
@@ -63,10 +63,10 @@ var OptionalPropertiesCertLoad = map[string]string{
 	mqtt.KeyFile:   "./key",
 }
 
-var TcpHostInfo = types.HostInfo{Host: "localhost", Protocol: "tcp"}
-var TlsHostInfo = types.HostInfo{Host: "localhost", Protocol: "tls"}
-var TcpsHostInfo = types.HostInfo{Host: "localhost", Protocol: "tcps"}
-var SslHostInfo = types.HostInfo{Host: "localhost", Protocol: "ssl"}
+var TcpHostInfo = types.HostInfo{Host: "localhost", Protocol: "tcp", Port: 1883}
+var TlsHostInfo = types.HostInfo{Host: "localhost", Protocol: "tls", Port: 8883}
+var TcpsHostInfo = types.HostInfo{Host: "localhost", Protocol: "tcps", Port: 8883}
+var SslHostInfo = types.HostInfo{Host: "localhost", Protocol: "ssl", Port: 8883}
 
 // TestMessageBusConfig defines a simple configuration used for testing successful options parsing.
 var TestMessageBusConfig = types.MessageBusConfig{