Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
StackExchange.Redis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
StackExchange.Redis
Commits
5e68d069
Commit
5e68d069
authored
Nov 06, 2015
by
Jeremy Meng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Define PLAT_SAFE_CONTINUATIONS constant. Also fix NETCORE that were missed in previous commit.
parent
9684afb8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
project.json
...is.Tests_dnxcore50/StackExchange.Redis.Tests/project.json
+1
-0
PhysicalConnection.cs
...kExchange.Redis/StackExchange/Redis/PhysicalConnection.cs
+4
-4
project.json
...Exchange.Redis_dnxcore50/StackExchange.Redis/project.json
+1
-1
No files found.
StackExchange.Redis.Tests_dnxcore50/StackExchange.Redis.Tests/project.json
View file @
5e68d069
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
"frameworks"
:
{
"frameworks"
:
{
"dnxcore50"
:
{
"dnxcore50"
:
{
"compilationOptions"
:
{
"compilationOptions"
:
{
"define"
:
[
"PLAT_SAFE_CONTINUATIONS"
],
"warningsAsErrors"
:
false
"warningsAsErrors"
:
false
},
},
"dependencies"
:
{
"dependencies"
:
{
...
...
StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs
View file @
5e68d069
...
@@ -129,7 +129,7 @@ public void Dispose()
...
@@ -129,7 +129,7 @@ public void Dispose()
if
(
outStream
!=
null
)
if
(
outStream
!=
null
)
{
{
multiplexer
.
Trace
(
"Disconnecting..."
,
physicalName
);
multiplexer
.
Trace
(
"Disconnecting..."
,
physicalName
);
#if !
NETCORE
#if !
DNXCORE50
try
{
outStream
.
Close
();
}
catch
{
}
try
{
outStream
.
Close
();
}
catch
{
}
#endif
#endif
try
{
outStream
.
Dispose
();
}
catch
{
}
try
{
outStream
.
Dispose
();
}
catch
{
}
...
@@ -137,7 +137,7 @@ public void Dispose()
...
@@ -137,7 +137,7 @@ public void Dispose()
}
}
if
(
netStream
!=
null
)
if
(
netStream
!=
null
)
{
{
#if !
NETCORE
#if !
DNXCORE50
try
{
netStream
.
Close
();
}
catch
{
}
try
{
netStream
.
Close
();
}
catch
{
}
#endif
#endif
try
{
netStream
.
Dispose
();
}
catch
{
}
try
{
netStream
.
Dispose
();
}
catch
{
}
...
@@ -229,7 +229,7 @@ public void RecordConnectionFailed(ConnectionFailureType failureType, ref Socket
...
@@ -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-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-Multiplexer-Heartbeat"
,
"last-mbeat"
,
multiplexer
.
LastHeartbeatSecondsAgo
+
"s ago"
);
add
(
"Last-Global-Heartbeat"
,
"global"
,
ConnectionMultiplexer
.
LastGlobalHeartbeatSecondsAgo
+
"s ago"
);
add
(
"Last-Global-Heartbeat"
,
"global"
,
ConnectionMultiplexer
.
LastGlobalHeartbeatSecondsAgo
+
"s ago"
);
#if !__MonoCS__ && !
NETCORE
#if !__MonoCS__ && !
DNXCORE50
var
mgr
=
bridge
.
Multiplexer
.
SocketManager
;
var
mgr
=
bridge
.
Multiplexer
.
SocketManager
;
add
(
"SocketManager-State"
,
"mgr"
,
mgr
.
State
.
ToString
());
add
(
"SocketManager-State"
,
"mgr"
,
mgr
.
State
.
ToString
());
add
(
"Last-Error"
,
"err"
,
mgr
.
LastErrorTimeRelative
());
add
(
"Last-Error"
,
"err"
,
mgr
.
LastErrorTimeRelative
());
...
@@ -757,7 +757,7 @@ SocketMode ISocketCallback.Connected(Stream stream, TextWriter log)
...
@@ -757,7 +757,7 @@ SocketMode ISocketCallback.Connected(Stream stream, TextWriter log)
int
bufferSize
=
config
.
WriteBuffer
;
int
bufferSize
=
config
.
WriteBuffer
;
this
.
netStream
=
stream
;
this
.
netStream
=
stream
;
#if !
NETCORE
#if !
DNXCORE50
this
.
outStream
=
bufferSize
<=
0
?
stream
:
new
BufferedStream
(
stream
,
bufferSize
);
this
.
outStream
=
bufferSize
<=
0
?
stream
:
new
BufferedStream
(
stream
,
bufferSize
);
#else
#else
this
.
outStream
=
stream
;
this
.
outStream
=
stream
;
...
...
StackExchange.Redis_dnxcore50/StackExchange.Redis/project.json
View file @
5e68d069
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
"frameworks"
:
{
"frameworks"
:
{
"dnxcore50"
:
{
"dnxcore50"
:
{
"compilationOptions"
:
{
"compilationOptions"
:
{
"define"
:
[
"
NETCORE
"
],
"define"
:
[
"
PLAT_SAFE_CONTINUATIONS
"
],
"allowUnsafe"
:
true
,
"allowUnsafe"
:
true
,
"warningsAsErrors"
:
false
"warningsAsErrors"
:
false
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment