diff --git a/ConnectorDataMqtt/ConnectorDataMqtt_Core.csproj b/ConnectorDataMqtt/ConnectorDataMqtt_Core.csproj
index a645e70..a7e51fe 100644
--- a/ConnectorDataMqtt/ConnectorDataMqtt_Core.csproj
+++ b/ConnectorDataMqtt/ConnectorDataMqtt_Core.csproj
@@ -15,6 +15,7 @@
git
1.1.0 Rewrite Module to reconnect itselfs, so you dont need to watch over the the state of the connection
de-DE
+ Mqtt.Data.Connector.IoT.Utils.BlubbFish
diff --git a/ConnectorDataMqtt/Mqtt.cs b/ConnectorDataMqtt/Mqtt.cs
index 2a1bdc8..bf65c82 100644
--- a/ConnectorDataMqtt/Mqtt.cs
+++ b/ConnectorDataMqtt/Mqtt.cs
@@ -13,7 +13,7 @@ namespace BlubbFish.Utils.IoT.Connector.Data {
private Thread connectionWatcher;
public Mqtt(Dictionary settings) : base(settings) {
- Console.WriteLine("BlubbFish.Utils.IoT.Connector.Data.Mqtt.Mqtt()");
+ Console.WriteLine("ConnectorDataMqtt_constr("+this.ToString()+")");
Int32 port = 1883;
if(this.settings.ContainsKey("port")) {
port = Int32.Parse(this.settings["port"]);
@@ -22,6 +22,25 @@ namespace BlubbFish.Utils.IoT.Connector.Data {
this.ConnectionWatcher();
}
+ public override String ToString() {
+ String ret = "mqtt://";
+ if (this.settings.ContainsKey("user")) {
+ ret += this.settings["user"];
+ if (this.settings.ContainsKey("pass")) {
+ ret += ":" + this.settings["pass"];
+ }
+ ret += "@";
+ }
+ ret += this.settings["server"];
+ if (this.settings.ContainsKey("port")) {
+ ret += ":" + this.settings["port"];
+ }
+ if (this.settings.ContainsKey("topic")) {
+ ret += "/" + this.settings["topic"];
+ }
+ return ret;
+ }
+
#region ConectionManage
private void ConnectionWatcher() {
this.connectionWatcher = new Thread(this.ConnectionWatcherRunner);
@@ -40,7 +59,7 @@ namespace BlubbFish.Utils.IoT.Connector.Data {
}
private void Reconnect() {
- Console.WriteLine("BlubbFish.Utils.IoT.Connector.Data.Mqtt.Reconnect()");
+ Console.WriteLine("ConnectorDataMqtt_Reconnect(" + this.ToString() + ")");
if(this.IsConnected) {
this.Disconnect(true);
} else {
@@ -50,7 +69,7 @@ namespace BlubbFish.Utils.IoT.Connector.Data {
}
private void Disconnect(Boolean complete) {
- Console.WriteLine("BlubbFish.Utils.IoT.Connector.Data.Mqtt.Disconnect()");
+ Console.WriteLine("ConnectorDataMqtt_Disconnect(" + this.ToString() + ")");
this.client.MqttMsgPublishReceived -= this.Client_MqttMsgPublishReceived;
this.Unsubscripe();
if(complete) {
@@ -59,7 +78,7 @@ namespace BlubbFish.Utils.IoT.Connector.Data {
}
private void Connect() {
- Console.WriteLine("BlubbFish.Utils.IoT.Connector.Data.Mqtt.Connect()");
+ Console.WriteLine("ConnectorDataMqtt_Connect(" + this.ToString() + ")");
this.client.MqttMsgPublishReceived += this.Client_MqttMsgPublishReceived;
_ = this.settings.ContainsKey("user") && this.settings.ContainsKey("pass")
? this.client.Connect(Guid.NewGuid().ToString(), this.settings["user"], this.settings["pass"])
@@ -106,11 +125,10 @@ namespace BlubbFish.Utils.IoT.Connector.Data {
protected virtual void Dispose(Boolean disposing) {
if(!this.disposedValue) {
- if(disposing) {try {
- try {
- this.connectionWatcher.Abort();
- this.connectionWatcher = null;
- } catch { }
+ if(disposing) {
+ try {
+ this.connectionWatcher.Abort();
+ this.connectionWatcher = null;
this.Disconnect(true);
} catch (Exception) { }
}