diff --git a/AIS/LS100PortProxy/MultiplexManager.cs b/AIS/LS100PortProxy/MultiplexManager.cs index 3af54ac3..41d81259 100644 --- a/AIS/LS100PortProxy/MultiplexManager.cs +++ b/AIS/LS100PortProxy/MultiplexManager.cs @@ -151,6 +151,10 @@ namespace LS100PortProxy { aChunk = connection.chunks.Dequeue(); //Trace.WriteLine(string.Format("{0} : {1}", connection.Socket.RemoteEndPoint, connection.chunks.Count)); + if (connection.chunks.Count % 10 == 0) + _log.WarnFormat("Chunk count reached {0} elements for Endpoint {1}", + connection.chunks.Count, + connection.Socket.RemoteEndPoint); } int bytesToSend = aChunk.length; byte[] buffer = aChunk.data; @@ -184,16 +188,16 @@ namespace LS100PortProxy } else { - _log.WarnFormat("something has happened with this consumer connection, breaking the forever loop"); + _log.WarnFormat("cannot write to reader, clearing chunks.."); // dump queue in this case, packets cannot be sent.. lock (_connections) { connection.chunks.Clear(); } - break; + // break; } - Thread.Sleep(50); + Thread.Sleep(500); } } catch (SocketException exc) diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index 42a9f541..5c4a2c18 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -35,8 +35,8 @@ 3.5.1.0 true publish.html - 1 - 5.0.14.%2a + 0 + 5.0.15.%2a false true true diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 469236c4..80dd8fd8 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 4532a871..c3377650 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("5.0.14")] +[assembly: AssemblyInformationalVersion("5.0.15")] [assembly: AssemblyCopyright("Copyright © 2014-2018 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index b168e724..8c2c9929 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("5.0.14.*")] +[assembly: AssemblyVersion("5.0.15.*")] diff --git a/nsw/Source/misc/db.sqlite b/nsw/Source/misc/db.sqlite index ec6df379..752cb45a 100644 Binary files a/nsw/Source/misc/db.sqlite and b/nsw/Source/misc/db.sqlite differ