Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

csredis update & fix for mono #400

Merged
merged 4 commits into from
Sep 2, 2014
Merged

csredis update & fix for mono #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ea52ed
Re-added csredis submodule.
Sep 2, 2014
fe54e3f
testing CSRedis:develop tree against #https://github.com/ctstone/csre…
Sep 2, 2014
5f0ffb9
testing csredis/develop against https://github.com/ctstone/csredis/is…
Sep 2, 2014
12070a4
trying endpoint fix for mono/csredis
Sep 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
url = https://github.com/CoiniumServ/Gibbed.IO.git
[submodule "deps/jsonconfig"]
path = deps/jsonconfig
url = https://github.com/CoiniumServ/JsonConfig.git
url = https://github.com/CoiniumServ/JsonConfig.git
[submodule "deps/csredis"]
path = deps/csredis
url = https://github.com/CoiniumServ/csredis.git
19 changes: 18 additions & 1 deletion build/CoiniumServ.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{02E410C9-83C5-4D63-8902-5AD041EBEB6C}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonConfig", "..\deps\jsonc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoiniumServGui", "..\src\CoiniumServGui\CoiniumServGui.csproj", "{1E2AF218-156A-40A0-8DA3-95DD13D93810}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSRedis", "..\deps\csredis\CSRedis\CSRedis.csproj", "{D35E185E-A7E1-41E1-846C-21944F56074F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -120,6 +122,21 @@ Global
{1E2AF218-156A-40A0-8DA3-95DD13D93810}.Testing|Mixed Platforms.ActiveCfg = Release|Any CPU
{1E2AF218-156A-40A0-8DA3-95DD13D93810}.Testing|Mixed Platforms.Build.0 = Release|Any CPU
{1E2AF218-156A-40A0-8DA3-95DD13D93810}.Testing|x86.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Debug|x86.ActiveCfg = Debug|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Any CPU.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Release|x86.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Any CPU.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Any CPU.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Mixed Platforms.ActiveCfg = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|Mixed Platforms.Build.0 = Release|Any CPU
{D35E185E-A7E1-41E1-846C-21944F56074F}.Testing|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions deps/csredis
Open in desktop
Submodule csredis added at 63528f
8 changes: 4 additions & 4 deletions src/CoiniumServ/CoiniumServ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\build\packages\CryptSharpOfficial.2.0.0.0\lib\CryptSharp.dll</HintPath>
</Reference>
<Reference Include="csredis, Version=3.2.1.0, Culture=neutral, PublicKeyToken=1afd0264bbe4a44a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\build\packages\csredis.3.2.1\lib\net40\csredis.dll</HintPath>
</Reference>
<Reference Include="Dapper, Version=1.34.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\build\packages\Dapper.1.34\lib\net45\Dapper.dll</HintPath>
Expand Down Expand Up @@ -953,6 +949,10 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\deps\csredis\CSRedis\CSRedis.csproj">
<Project>{d35e185e-a7e1-41e1-846c-21944f56074f}</Project>
<Name>CSRedis</Name>
</ProjectReference>
<ProjectReference Include="..\..\deps\gibbed.io\Gibbed.IO.csproj">
<Project>{047857ba-daa3-4ca7-afb8-a1b082b28c6a}</Project>
<Name>Gibbed.IO</Name>
Expand Down
6 changes: 5 additions & 1 deletion src/CoiniumServ/Persistance/Providers/Redis/RedisProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
//
#endregion
using System;
using System.Net;
using CoiniumServ.Pools;
using CSRedis;
using Serilog;
Expand Down Expand Up @@ -51,8 +52,11 @@ private void Initialize()
{
try
{
// for mono compatibility, we need to define an endpoint.
var endpoint = new IPEndPoint(IPAddress.Parse(_config.Host), _config.Port);

// create the connection
Client = new RedisClient(_config.Host, _config.Port)
Client = new RedisClient(endpoint)
{
ReconnectAttempts = 3,
ReconnectWait = 200
Expand Down
1 change: 0 additions & 1 deletion src/CoiniumServ/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<package id="AustinHarris.JsonRpc" version="1.0.4.18" targetFramework="net45" />
<package id="BouncyCastle" version="1.7.0" targetFramework="net45" />
<package id="CryptSharpOfficial" version="2.0.0.0" targetFramework="net45" />
<package id="csredis" version="3.2.1" targetFramework="net45" />
<package id="Dapper" version="1.34" targetFramework="net45" />
<package id="FluentMigrator" version="1.3.0.0" targetFramework="net45" />
<package id="FluentMigrator.Runner" version="1.3.0.0" targetFramework="net45" />
Expand Down
8 changes: 8 additions & 0 deletions src/CoiniumServGui/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,12 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>