Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit b55a4f5

Browse files
committed
Document RedisConfig options, change DefaultConnectTimeout to -1 to be consistent with Send/Receive Timeout
1 parent c08cdb5 commit b55a4f5

File tree

2 files changed

+52
-5
lines changed

2 files changed

+52
-5
lines changed

src/ServiceStack.Redis/RedisConfig.cs

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,79 @@ public class RedisConfig
1313
public const int DefaultPortSentinel = 26379;
1414
public const string DefaultHost = "localhost";
1515

16+
/// <summary>
17+
/// Factory used to Create `RedisClient` instances
18+
/// </summary>
1619
public static Func<RedisEndpoint, RedisClient> ClientFactory = c =>
1720
{
1821
Interlocked.Increment(ref RedisState.TotalClientsCreated);
1922
return new RedisClient(c);
2023
};
2124

22-
public static int DefaultConnectTimeout = 0;
25+
/// <summary>
26+
/// The default RedisClient Socket ConnectTimeout (default -1, None)
27+
/// </summary>
28+
public static int DefaultConnectTimeout = -1;
29+
30+
/// <summary>
31+
/// The default RedisClient Socket SendTimeout (default -1, None)
32+
/// </summary>
2333
public static int DefaultSendTimeout = -1;
34+
35+
/// <summary>
36+
/// The default RedisClient Socket ReceiveTimeout (default -1, None)
37+
/// </summary>
2438
public static int DefaultReceiveTimeout = -1;
25-
public static int DefaultRetryTimeout = 3 * 1000;
39+
40+
/// <summary>
41+
/// Default Idle TimeOut before a connection is considered to be stale (default 240 secs)
42+
/// </summary>
2643
public static int DefaultIdleTimeOutSecs = 240;
44+
45+
/// <summary>
46+
/// The default RetryTimeout for auto retry of failed operations (default 3000ms)
47+
/// </summary>
48+
public static int DefaultRetryTimeout = 3 * 1000;
49+
50+
/// <summary>
51+
/// The BackOff multiplier failed Auto Retries starts from (default 10ms)
52+
/// </summary>
2753
public static int BackOffMultiplier = 10;
2854

55+
/// <summary>
56+
/// The Byte Buffer Size to combine Redis Operations within (default 1450 bytes)
57+
/// </summary>
2958
public static int BufferLength = 1450;
3059

60+
/// <summary>
61+
/// The Byte Buffer Size for Operations to use a byte buffer pool (default 500kb)
62+
/// </summary>
3163
public static int BufferPoolMaxSize = 500000;
3264

65+
/// <summary>
66+
/// Whether Connections to Master hosts should be verified they're still master instances (default true)
67+
/// </summary>
3368
public static bool VerifyMasterConnections = true;
3469

70+
/// <summary>
71+
/// The ConnectTimeout on clients used to find the next available host (default 200ms)
72+
/// </summary>
3573
public static int HostLookupTimeoutMs = 200;
3674

37-
//Skip ServerVersion Checks by specifying Min Version number, e.g: 2.8.12 => 2812, 2.9.1 => 2910
75+
/// <summary>
76+
/// Skip ServerVersion Checks by specifying Min Version number, e.g: 2.8.12 => 2812, 2.9.1 => 2910
77+
/// </summary>
3878
public static int? AssumeServerVersion;
3979

80+
/// <summary>
81+
/// How long to hold deactivated clients for before disposing their connection (default 1 min)
82+
/// Dispose of deactivated Clients immediately with TimeSpan.Zero
83+
/// </summary>
4084
public static TimeSpan DeactivatedClientsExpiry = TimeSpan.FromMinutes(1);
4185

86+
/// <summary>
87+
/// Whether Debug Logging should log detailed Redis operations (default false)
88+
/// </summary>
4289
public static bool DisableVerboseLogging = false;
4390

4491
//Example at: http://msdn.microsoft.com/en-us/library/office/dd633677(v=exchg.80).aspx
@@ -52,7 +99,7 @@ public static void Reset()
5299
{
53100
RedisStats.Reset();
54101

55-
DefaultConnectTimeout = 0;
102+
DefaultConnectTimeout = -1;
56103
DefaultSendTimeout = -1;
57104
DefaultReceiveTimeout = -1;
58105
DefaultRetryTimeout = 3 * 1000;

src/ServiceStack.Redis/RedisNativeClient_Utils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private void Connect()
7676
};
7777
try
7878
{
79-
if (ConnectTimeout == 0)
79+
if (ConnectTimeout <= 0)
8080
{
8181
socket.Connect(Host, Port);
8282
}

0 commit comments

Comments
 (0)