aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Transport
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2020-01-29 16:42:59 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2020-01-29 16:42:59 +0200
commita1fdee086eff6b78e863efcc248e70fca248437e (patch)
treed133b346bae839b20a8a6ae0d88509c767cc396a /Software/Visual_Studio/Tango.Transport
parentaaa93103ae4db626d29081ce247df3b6143a39f8 (diff)
downloadTango-a1fdee086eff6b78e863efcc248e70fca248437e.tar.gz
Tango-a1fdee086eff6b78e863efcc248e70fca248437e.zip
Improved ExternalBridge SignalR error handling...
Improved logging of adapters connected/disconnected...
Diffstat (limited to 'Software/Visual_Studio/Tango.Transport')
-rw-r--r--Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs3
-rw-r--r--Software/Visual_Studio/Tango.Transport/Adapters/TcpTransportAdapter.cs4
-rw-r--r--Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs6
3 files changed, 9 insertions, 4 deletions
diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs
index 17e02f1aa..433fad712 100644
--- a/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs
+++ b/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs
@@ -227,8 +227,9 @@ namespace Tango.Transport.Adapters
LogManager.Log(ex, "Error disposing SignalR adapter connection.");
}
}, TimeSpan.FromSeconds(5));
- State = TransportComponentState.Disconnected;
+
LogManager.Log("SignalR adapter disconnected.");
+ State = TransportComponentState.Disconnected;
}
});
}
diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/TcpTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/TcpTransportAdapter.cs
index b855c8f1d..9f726f3bf 100644
--- a/Software/Visual_Studio/Tango.Transport/Adapters/TcpTransportAdapter.cs
+++ b/Software/Visual_Studio/Tango.Transport/Adapters/TcpTransportAdapter.cs
@@ -108,6 +108,8 @@ namespace Tango.Transport.Adapters
SetSocketProperties();
}
+ LogManager.Log($"TCP adapter ({Address}) Connected...");
+
State = TransportComponentState.Connected;
_pullThread = new Thread(PullThreadMethod);
_pullThread.Name = $"{ComponentName} Pull Thread";
@@ -122,8 +124,6 @@ namespace Tango.Transport.Adapters
_pushQueue = new ProducerConsumerQueue<byte[]>();
_pushThread.Start();
}
-
- LogManager.Log($"TCP adapter ({Address}) Connected...");
}
}
catch (Exception ex)
diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs
index f160cecf2..bc0a1ae41 100644
--- a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs
+++ b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs
@@ -87,6 +87,9 @@ namespace Tango.Transport.Adapters
_serialPort.DiscardInBuffer();
_serialPort.DiscardOutBuffer();
+
+ LogManager.Log($"USB adapter ({Address}) Connected...");
+
State = TransportComponentState.Connected;
if (!source.Task.IsCompleted)
@@ -151,8 +154,9 @@ namespace Tango.Transport.Adapters
_serialPort.Close();
_serialPort.Dispose();
- State = TransportComponentState.Disconnected;
LogManager.Log("USB adapter disconnected.");
+
+ State = TransportComponentState.Disconnected;
}
catch (Exception ex)
{