Merge pull request #406 from CoiniumServ/develop

Hüseyin Uslu · Hüseyin Uslu · commit 2ae178cce2a1 · 2014-09-03T13:17:18.000+03:00
sync 0.1.4-alpha to master
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,9 @@
-##### [v0.1.3 alpha - Piri Reis](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.3-alpha) - 03.09.2014
+##### [v0.1.4 alpha](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.4-alpha) - 03.09.2014
+
+**Storage**
+* Downgraded csredis package at it was causing problems with mono.
+
+##### [v0.1.3 alpha](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.3-alpha) - 03.09.2014
 
 **Storage**
 * Implemented storage layers support; hybrid-storage (redis+mysql) and mpos compatibility (mysql).
@@ -23,13 +28,13 @@
 * File path handling improvements.
 * Fixed app.config.
 
-##### [v0.1.2 alpha - Piri Reis](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.2-alpha) - 14.08.2014
+##### [v0.1.2 alpha](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.2-alpha) - 14.08.2014
 
 **Payments**
 * Fixed a major bug in payment processor which was preventing payments to miners.
 * Fixed a bug in statistics manager.
 
-##### [v0.1.1 alpha - Piri Reis](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.1-alpha) - 10.08.2014
+##### [v0.1.1 alpha](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.1-alpha) - 10.08.2014
 **Mining**
 * Improved SocketServiceContext and removed unnecessary overhead.
 * New block found message is no more sent to miners as the miner software can already determine itself.
@@ -53,6 +58,6 @@
 * Double.parse() and float.parse() calls will now correctly use CultureInfo.InvariantCulture - basically fixing potential problems with non en-US systems.
 
 
-##### [v0.1.0 alpha - Piri Reis](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.0-alpha) - 08.08.2014
+##### [v0.1.0 alpha](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.0-alpha) - 08.08.2014
 
 Initial release which is fully functional with a basic feature set.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ You can send tips and furher support the project or get tips for contributing by
 
 ### Status
 
-[v0.1.3 alpha](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.3-alpha) released
+[v0.1.4 alpha](https://github.com/CoiniumServ/CoiniumServ/releases/tag/v0.1.4-alpha) released
 
 ### Features
 
diff --git a/deps/csredis b/deps/csredis
@@ -1 +1 @@
-Subproject commit 63528f315dea5ebb07d1ced0809b4083a1bfeb2f
+Subproject commit 6667063d156bf04673449996b4f3560918631c4c
diff --git a/src/CoiniumServ/Persistance/Providers/Redis/RedisProvider.cs b/src/CoiniumServ/Persistance/Providers/Redis/RedisProvider.cs
@@ -30,7 +30,7 @@ namespace CoiniumServ.Persistance.Providers.Redis
 {
     public class RedisProvider : IRedisProvider
     {
-        public bool IsConnected { get { return Client.IsConnected; } }
+        public bool IsConnected { get { return Client.Connected; } }
 
         public RedisClient Client { get; private set; }
         private readonly Version _requiredMinimumVersion = new Version(2, 6);
@@ -52,14 +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(endpoint)
+                Client = new RedisClient(_config.Host, _config.Port)
                 {
                     ReconnectAttempts = 3,
-                    ReconnectWait = 200
+                    ReconnectTimeout = 200
                 };
 
                 // select the database
diff --git a/src/CoiniumServ/Utils/Versions/VersionInfo.cs b/src/CoiniumServ/Utils/Versions/VersionInfo.cs
@@ -41,7 +41,7 @@ public static class Assembly
             /// <summary>
             /// Main assemby version.
             /// </summary>
-            public const string Version = "0.1.3.*";
+            public const string Version = "0.1.4.*";
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace CoiniumServ.Persistance.Providers.Redis`
`30`	`30`	`{`
`31`	`31`	`public class RedisProvider : IRedisProvider`
`32`	`32`	`{`
`33`		`- public bool IsConnected { get { return Client.IsConnected; } }`
	`33`	`+ public bool IsConnected { get { return Client.Connected; } }`
`34`	`34`
`35`	`35`	`public RedisClient Client { get; private set; }`
`36`	`36`	`private readonly Version _requiredMinimumVersion = new Version(2, 6);`
`@@ -52,14 +52,11 @@ private void Initialize()`
`52`	`52`	`{`
`53`	`53`	`try`
`54`	`54`	`{`
`55`		`- // for mono compatibility, we need to define an endpoint.`
`56`		`- var endpoint = new IPEndPoint(IPAddress.Parse(_config.Host), _config.Port);`
`57`		`-`
`58`	`55`	`// create the connection`
`59`		`- Client = new RedisClient(endpoint)`
	`56`	`+ Client = new RedisClient(_config.Host, _config.Port)`
`60`	`57`	`{`
`61`	`58`	`ReconnectAttempts = 3,`
`62`		`- ReconnectWait = 200`
	`59`	`+ ReconnectTimeout = 200`
`63`	`60`	`};`
`64`	`61`
`65`	`62`	`// select the database`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static class Assembly`
`41`	`41`	`/// <summary>`
`42`	`42`	`/// Main assemby version.`
`43`	`43`	`/// </summary>`
`44`		`- public const string Version = "0.1.3.*";`
	`44`	`+ public const string Version = "0.1.4.*";`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`