Added KeepAlives, PiRelay Plate Reference Updated.

TWhidden · Oct 8, 2018 · f2419f3 · f2419f3
1 parent 02c004d
commit f2419f3
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 21 deletions.
diff --git a/HolidayShowClient.Core/Containers/ProtocolClient.cs b/HolidayShowClient.Core/Containers/ProtocolClient.cs
@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using HolidayShowEndpointUniversalApp.Services;
 using HolidayShowLib;
-using RailwaySharp.ErrorHandling;
 
 namespace HolidayShowEndpointUniversalApp.Containers
 {
@@ -37,6 +34,8 @@ private void CreateClientSocket()
 
             _client = new TcpClient();
             _client.BeginConnect(_endPoint.EndPoint.Host, _endPoint.EndPoint.Port, ClientConnectionCompleted, null);
+            _client.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
+            _client.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, 1000);
         }
 
         private void ClientConnectionCompleted(IAsyncResult r)
@@ -48,9 +47,12 @@ private void ClientConnectionCompleted(IAsyncResult r)
                 if (!_client.Connected)
                 {
                     Disconnect();
+                    Console.WriteLine("Connected == False!");
                     return;
                 }
 
+                Console.WriteLine($"Connected to {_endPoint.EndPoint.Host}:{_endPoint.EndPoint.Port}!");
+
                 _stream = _client.GetStream();
 
                 NetworkStreamRead();
@@ -73,6 +75,13 @@ private async void NetworkStreamRead()
                 _cancellationTokenSource = new CancellationTokenSource();
                 var bufferRead = await _stream.ReadAsync(_readBuffer, 0, BufferLength, _cancellationTokenSource.Token);
 
+                if (bufferRead == 0)
+                {
+                    // 0 byte indicates a disconnected.
+                    Console.Write("0 bytes detected on receive. Reconnect");
+                    Disconnect();
+                }
+
                 var data = new byte[bufferRead];
                 Buffer.BlockCopy(_readBuffer, 0, data, 0, bufferRead);
                 BytesReceived(data);

diff --git a/HolidayShowClient.Core/HolidayShowClient.Core.csproj b/HolidayShowClient.Core/HolidayShowClient.Core.csproj
@@ -3,6 +3,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <AssemblyVersion>2.18.1007.0</AssemblyVersion>
+    <FileVersion>2.18.1007.0</FileVersion>
+    <Version>2.18.1007.0</Version>
+    <Authors>Travis Whidden</Authors>
+    <Company>None</Company>
+    <Description>Client for RP3 devices</Description>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/HolidayShowServer.Core/HolidayShowServer.Core.csproj b/HolidayShowServer.Core/HolidayShowServer.Core.csproj
@@ -6,10 +6,10 @@
     <Authors>Travis Whidden</Authors>
     <Company>None</Company>
     <AssemblyName>holidayshowserver.core</AssemblyName>
-    <AssemblyVersion>2.18.0924.0</AssemblyVersion>
+    <AssemblyVersion>2.18.1007.0</AssemblyVersion>
     <FileVersion>2.18.0924.0</FileVersion>
     <Configurations>Debug;Release;ReleaseCore</Configurations>
-    <Version>2.18.0924</Version>
+    <Version>2.18.1007</Version>
     <PackageReleaseNotes>Reduced Database calls to reduce CPU. Code cleanup</PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/HolidayShowServer.Core/Properties/launchSettings.json b/HolidayShowServer.Core/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "HolidayShowServer.Core": {
       "commandName": "Project",
-      "commandLineArgs": "-p 5555 -d \"10.64.128.100,1401\" -n  \"HolidayShow_Dev\" -u \"dev\" -s \"dev123\"",
+      "commandLineArgs": "-p 5556 -d \"10.64.128.100,1401\" -n  \"HolidayShow_Dev\" -u \"dev\" -s \"dev123\"",
       "environmentVariables": {
         "DBUSER": "dev",
         "DBNAME": "HolidayShow_Dev",

diff --git a/HolidayShowServer/TcpServer.cs b/HolidayShowServer/TcpServer.cs
@@ -39,14 +39,15 @@ protected virtual void InvokeOnClientConnected(NewClientEventArgs e)
         private void AcceptClient()
         {
             _listener.BeginAcceptTcpClient(EndAcceptClient, null);
-
         }
 
         private void EndAcceptClient(IAsyncResult a)
         {
             try
             {
                 var client = _listener.EndAcceptTcpClient(a);
+                client.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
+                client.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, 1000);
                 InvokeOnClientConnected(new NewClientEventArgs(client));
             }
             catch

diff --git a/References/PiRelayPlate.NetCore.dll b/References/PiRelayPlate.NetCore.dll
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,21 +1,21 @@
 version: '3.4'
 
 services:
- # HolidayShowClient:
- #   image: holidayshowclient
- #   build:
- #     context: .
- #     dockerfile: HolidayShowClient.Core/Dockerfile
+  HolidayShowClient:
+    image: holidayshowclient
+    build:
+      context: .
+      dockerfile: HolidayShowClient.Core/Dockerfile
 
 
-  #HolidayShowServer:
-  # image: holidayshowserver
-  # build:
-  #   context: .
-  #   dockerfile: HolidayShowServer.Core/Dockerfile
-
-  HolidayShowEdit:
-   image: holidayshowedit
+  HolidayShowServer:
+   image: holidayshowserver
    build:
      context: .
-     dockerfile: HolidayShowWeb/Dockerfile
+     dockerfile: HolidayShowServer.Core/Dockerfile
+
+  #HolidayShowEdit:
+  # image: holidayshowedit
+  # build:
+  #   context: .
+  #   dockerfile: HolidayShowWeb/Dockerfile