Commit 39cc2a79 authored by Jeremy Meng's avatar Jeremy Meng

Disable socket polling for dnxcore.

parent 04f6eba9
......@@ -11,7 +11,7 @@
],
"dependencies": {
"StackExchange.Redis": ""
"StackExchange.Redis": "1.0.0-*"
},
"frameworks": {
......@@ -22,30 +22,7 @@
"warningsAsErrors": false
},
"dependencies": {
"System.Diagnostics.Debug": "4.0.0",
"System.Diagnostics.TraceSource": "4.0.0-beta-*",
"System.Diagnostics.Tools": "4.0.0-beta-*",
"System.IO.Compression": "4.0.0",
"System.Globalization": "4.0.10",
"System.Linq": "4.0.0",
"System.Net.Primitives": "4.0.10",
"System.Net.Sockets": "4.1.0-beta-*",
"System.Net.Security": "4.0.0-beta-*",
"System.Net.NameResolution": "4.0.0-beta-*",
"System.Reflection": "4.0.0",
"System.Reflection.Emit": "4.0.0",
"System.Reflection.TypeExtensions": "4.0.0",
"System.Reflection.Primitives": "4.0.0",
"System.Reflection.Emit.Lightweight": "4.0.0",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-*",
"System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*",
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
"System.Text.RegularExpressions": "4.0.0",
"System.Threading": "4.0.0",
"System.Threading.Thread": "4.0.0-*",
"System.Threading.ThreadPool": "4.0.10-beta-*",
"System.Threading.Timer": "4.0.1-beta-*",
"System.Threading.Tasks": "4.0.0",
"System.Console": "4.0.0-beta-*",
"nunit": "3.0.0-beta-5"
}
}
......
......@@ -1887,7 +1887,7 @@ internal T ExecuteSyncImpl<T>(Message message, ResultProcessor<T> processor, Ser
else
{
int inst, qu, qs, qc, wr, wq, @in, ar;
#if !__MonoCS__
#if !__MonoCS__ && !NETCORE
var mgrState = socketManager.State;
var lastError = socketManager.LastErrorTimeRelative();
......@@ -1902,7 +1902,7 @@ internal T ExecuteSyncImpl<T>(Message message, ResultProcessor<T> processor, Ser
int queue = server.GetOutstandingCount(message.Command, out inst, out qu, out qs, out qc, out wr, out wq, out @in, out ar);
add("Instantaneous", "inst", inst.ToString());
#if !__MonoCS__
#if !__MonoCS__ && !NETCORE
add("Manager-State", "mgr", mgrState.ToString());
add("Last-Error", "err", lastError);
#endif
......
......@@ -229,7 +229,7 @@ public void RecordConnectionFailed(ConnectionFailureType failureType, ref Socket
add("Last-Heartbeat", "last-heartbeat", (lastBeat == 0 ? "never" : (unchecked(now - lastBeat)/1000 + "s ago"))+ (bridge.IsBeating ? " (mid-beat)" : "") );
add("Last-Multiplexer-Heartbeat", "last-mbeat", multiplexer.LastHeartbeatSecondsAgo + "s ago");
add("Last-Global-Heartbeat", "global", ConnectionMultiplexer.LastGlobalHeartbeatSecondsAgo + "s ago");
#if !__MonoCS__
#if !__MonoCS__ && !NETCORE
var mgr = bridge.Multiplexer.SocketManager;
add("SocketManager-State", "mgr", mgr.State.ToString());
add("Last-Error", "err", mgr.LastErrorTimeRelative());
......
#if __MonoCS__
#if __MonoCS__ || NETCORE
namespace StackExchange.Redis
{
......
......@@ -5,7 +5,7 @@
using System.Runtime.InteropServices;
using System.Threading;
#if !__MonoCS__
#if !__MonoCS__ && !NETCORE
namespace StackExchange.Redis
{
......
......@@ -3,5 +3,6 @@
"version": "1.0.0-beta7",
"runtime": "coreclr",
"architecture": "x86"
}
},
"projects": [ "StackExchange.Redis_dnxcore50" ]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment