Skip to content

Commit c1f670c

Browse files
committed
Using new version of SimplSockets; fixed bug in remove item callback test
1 parent e0f8b97 commit c1f670c

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

Dache.CacheHost/Communication/CacheHostServer.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ internal class CacheHostServer : ICacheHostContract, IRunnable
4141
// The logger
4242
private readonly ILogger _logger;
4343

44+
// The invalid command string list
45+
private readonly List<string> _invalidCommandStringList = new List<string> { "invalid command" };
46+
4447
/// <summary>
4548
/// The constructor.
4649
/// </summary>
@@ -103,6 +106,7 @@ public CacheHostServer(IMemCache memCache, ITagRoutingTable tagRoutingTable, ILo
103106

104107
// Hook into received message event
105108
_server.MessageReceived += ReceiveMessage;
109+
_server.Error += (sender, e) => { _logger.Warn("Dache Client Disconnected", e.Exception); };
106110
}
107111

108112
private void ReceiveMessage(object sender, MessageReceivedArgs e)
@@ -326,6 +330,12 @@ private byte[] ProcessCommand(string command)
326330
}
327331
break;
328332
}
333+
default:
334+
{
335+
// Invalid command
336+
commandResult = CreateCommandResult(_invalidCommandStringList);
337+
break;
338+
}
329339
}
330340

331341
// Return the result - may be null if there was no valid message

Dache.CacheHost/Dache.CacheHost.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
<Reference Include="SharpMemoryCache">
4949
<HintPath>..\packages\SharpMemoryCache.1.0.0\lib\SharpMemoryCache.dll</HintPath>
5050
</Reference>
51-
<Reference Include="SimplSockets, Version=1.3.0.37244, Culture=neutral, processorArchitecture=MSIL">
51+
<Reference Include="SimplSockets, Version=1.3.0.42869, Culture=neutral, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\SimplSockets.1.3.0\lib\SimplSockets.dll</HintPath>
53+
<HintPath>..\packages\SimplSockets.1.3.1\lib\SimplSockets.dll</HintPath>
5454
</Reference>
5555
<Reference Include="System" />
5656
<Reference Include="System.Core" />

Dache.CacheHost/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="SharpMemoryCache" version="1.0.0" targetFramework="net45" />
4-
<package id="SimplSockets" version="1.3.0" targetFramework="net40" />
4+
<package id="SimplSockets" version="1.3.1" targetFramework="net40" />
55
</packages>

Dache.Client/Dache.Client.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
<Reference Include="SharpMemoryCache">
4141
<HintPath>..\packages\SharpMemoryCache.1.0.0\lib\SharpMemoryCache.dll</HintPath>
4242
</Reference>
43-
<Reference Include="SimplSockets, Version=1.3.0.37244, Culture=neutral, processorArchitecture=MSIL">
43+
<Reference Include="SimplSockets, Version=1.3.0.42869, Culture=neutral, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\packages\SimplSockets.1.3.0\lib\SimplSockets.dll</HintPath>
45+
<HintPath>..\packages\SimplSockets.1.3.1\lib\SimplSockets.dll</HintPath>
4646
</Reference>
4747
<Reference Include="System" />
4848
<Reference Include="System.configuration" />

Dache.Client/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="SharpMemoryCache" version="1.0.0" targetFramework="net45" />
4-
<package id="SimplSockets" version="1.3.0" targetFramework="net40" />
4+
<package id="SimplSockets" version="1.3.1" targetFramework="net40" />
55
</packages>

Dache.PerformanceTests/RemovedItemCallback/RemovedItemCallbackTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void Run()
2121

2222
cacheClient.HostDisconnected += (sender, e) => { Console.WriteLine("*** Host disconnected"); };
2323
cacheClient.HostReconnected += (sender, e) => { Console.WriteLine("*** Host reconnected"); };
24-
cacheClient.CacheItemExpired += (sender, e) => { Interlocked.Increment(ref totalCallbacks); Console.WriteLine(string.Format("Cache key expired: {1}, Total Removed: {1}", e.CacheKey, totalCallbacks)); };
24+
cacheClient.CacheItemExpired += (sender, e) => { Interlocked.Increment(ref totalCallbacks); Console.WriteLine(string.Format("Cache key expired: {0}, Total Removed: {1}", e.CacheKey, totalCallbacks)); };
2525

2626
// Add items
2727
for (int i = 0; i < itemsToAdd; i++)

0 commit comments

Comments
 (0)