Commit dc589e4f authored by Marc Gravell's avatar Marc Gravell

Merge branch 'master' into pipelines

# Conflicts:
#	StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs
parents d9d78f8b 1799c39d
echo Starting Redis servers for testing...
#Basic Servers
echo Starting Basic: 6379-6382
pushd Basic > /dev/null
echo Master: 6379
redis-server master-6379.conf &>/dev/null &
echo Slave: 6380
redis-server slave-6380.conf &>/dev/null &
echo Secure: 6381
redis-server secure-6381.conf &>/dev/null &
popd > /dev/null
#Failover Servers
echo Starting Failover: 6382-6383
pushd Failover > /dev/null
echo Master: 6382
redis-server master-6382.conf &>/dev/null &
echo Slave: 6383
redis-server slave-6383.conf &>/dev/null &
popd > /dev/null
# Cluster Servers
echo Starting Cluster: 7000-7005
pushd Cluster > /dev/null
redis-server cluster-7000.conf &>/dev/null &
redis-server cluster-7001.conf &>/dev/null &
redis-server cluster-7002.conf &>/dev/null &
redis-server cluster-7003.conf &>/dev/null &
redis-server cluster-7004.conf &>/dev/null &
redis-server cluster-7005.conf &>/dev/null &
popd > /dev/null
#Sentinel Servers
echo Starting Sentinel: 7010-7011,26379-26380
pushd Sentinel > /dev/null
echo Targets: 7010-7011
redis-server redis-7010.conf &>/dev/null &
redis-server redis-7011.conf &>/dev/null &
echo Monitors: 26379-26380
redis-server sentinel-26379.conf --sentinel &>/dev/null &
redis-server sentinel-26380.conf --sentinel &>/dev/null &
popd > /dev/null
echo Servers started.
\ No newline at end of file
...@@ -321,6 +321,7 @@ public int ConnectTimeout ...@@ -321,6 +321,7 @@ public int ConnectTimeout
/// <summary> /// <summary>
/// The size of the output buffer to use /// The size of the output buffer to use
/// </summary> /// </summary>
[Obsolete("This setting no longer has any effect, and should not be used")]
public int WriteBuffer { get { return writeBuffer.GetValueOrDefault(4096); } set { writeBuffer = value; } } public int WriteBuffer { get { return writeBuffer.GetValueOrDefault(4096); } set { writeBuffer = value; } }
internal LocalCertificateSelectionCallback CertificateSelectionCallback { get { return CertificateSelection; } private set { CertificateSelection = value; } } internal LocalCertificateSelectionCallback CertificateSelectionCallback { get { return CertificateSelection; } private set { CertificateSelection = value; } }
...@@ -631,7 +632,9 @@ private void DoParse(string configuration, bool ignoreUnknown) ...@@ -631,7 +632,9 @@ private void DoParse(string configuration, bool ignoreUnknown)
HighPrioritySocketThreads = OptionKeys.ParseBoolean(key, value); HighPrioritySocketThreads = OptionKeys.ParseBoolean(key, value);
break; break;
case OptionKeys.WriteBuffer: case OptionKeys.WriteBuffer:
#pragma warning disable CS0618 // Type or member is obsolete
WriteBuffer = OptionKeys.ParseInt32(key, value); WriteBuffer = OptionKeys.ParseInt32(key, value);
#pragma warning restore CS0618 // Type or member is obsolete
break; break;
case OptionKeys.Proxy: case OptionKeys.Proxy:
Proxy = OptionKeys.ParseProxy(key, value); Proxy = OptionKeys.ParseProxy(key, value);
......
...@@ -904,9 +904,8 @@ async ValueTask<SocketMode> ISocketCallback.ConnectedAsync(Socket socket, TextWr ...@@ -904,9 +904,8 @@ async ValueTask<SocketMode> ISocketCallback.ConnectedAsync(Socket socket, TextWr
} }
OnWrapForLogging(ref pipe, physicalName); OnWrapForLogging(ref pipe, physicalName);
int bufferSize = config.WriteBuffer;
_ioPipe = pipe; _ioPipe = pipe;
Multiplexer.LogLocked(log, "Connected {0}", Bridge); Multiplexer.LogLocked(log, "Connected {0}", Bridge);
await Bridge.OnConnectedAsync(this, log); await Bridge.OnConnectedAsync(this, log);
......
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