Skip to content

Commit

Permalink
Merge pull request #406 from CoiniumServ/develop
Browse files Browse the repository at this point in the history
sync 0.1.4-alpha to master
  • Loading branch information
Hüseyin Uslu committed Sep 3, 2014
2 parents 1f3078d + cd684cf commit 2ae178c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
13 changes: 9 additions & 4 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -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).
Expand All @@ -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.
Expand All @@ -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.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion deps/csredis
Submodule csredis updated 55 files
+17 −31 CHANGELOG.md
+11 −20 CSRedis.Tests/CSRedis.Tests.csproj
+11 −13 CSRedis.Tests/ConnectionTests.cs
+34 −36 CSRedis.Tests/HashTests.cs
+6 −8 CSRedis.Tests/HyperLogLogTests.cs
+46 −48 CSRedis.Tests/KeyTests.cs
+38 −40 CSRedis.Tests/ListTests.cs
+16 −18 CSRedis.Tests/PubSubTests.cs
+0 −26 CSRedis.Tests/RegressionTests.cs
+12 −16 CSRedis.Tests/ScriptingTests.cs
+3 −5 CSRedis.Tests/SentinelTests.cs
+56 −58 CSRedis.Tests/ServerTests.cs
+30 −32 CSRedis.Tests/SetTests.cs
+46 −48 CSRedis.Tests/SortedSetTests.cs
+46 −48 CSRedis.Tests/StringTests.cs
+10 −12 CSRedis.Tests/TransactionTests.cs
+6 −25 CSRedis/CSRedis.csproj
+2 −25 CSRedis/Exceptions.cs
+0 −2,105 CSRedis/IRedisClient.cs
+0 −2,080 CSRedis/IRedisClientAsync.cs
+1 −1 CSRedis/Internal/Commands/RedisArray.cs
+1 −1 CSRedis/Internal/Commands/RedisBytes.cs
+0 −12 CSRedis/Internal/Commands/RedisObject.cs
+118 −0 CSRedis/Internal/DefaultConnector.cs
+0 −81 CSRedis/Internal/Fakes/FakeRedisSocket.cs
+0 −49 CSRedis/Internal/Fakes/FakeStream.cs
+0 −170 CSRedis/Internal/IO/AsyncConnector.cs
+0 −43 CSRedis/Internal/IO/RedisAsyncCommandToken.cs
+0 −46 CSRedis/Internal/IO/RedisIO.cs
+23 −27 CSRedis/Internal/IO/RedisReader.cs
+0 −67 CSRedis/Internal/IO/RedisSocket.cs
+150 −25 CSRedis/Internal/IO/RedisWriter.cs
+0 −70 CSRedis/Internal/IO/SocketAsyncPool.cs
+24 −0 CSRedis/Internal/IRedisConnector.cs
+263 −0 CSRedis/Internal/MockConnector.cs
+3 −3 CSRedis/Internal/MonitorListener.cs
+8 −14 CSRedis/Internal/RedisCommand.cs
+244 −0 CSRedis/Internal/RedisConnection.cs
+0 −231 CSRedis/Internal/RedisConnector.cs
+4 −4 CSRedis/Internal/RedisListener.cs
+8 −14 CSRedis/Internal/RedisPipeline.cs
+18 −18 CSRedis/Internal/RedisTransaction.cs
+1 −1 CSRedis/Internal/SubscriptionListener.cs
+1 −1 CSRedis/Internal/Utilities/RedisArgs.cs
+4 −4 CSRedis/Properties/AssemblyInfo.cs
+183 −183 CSRedis/RedisClient.Async.cs
+202 −210 CSRedis/RedisClient.Sync.cs
+37 −96 CSRedis/RedisClient.cs
+14 −14 CSRedis/RedisSentinelClient.Async.cs
+19 −19 CSRedis/RedisSentinelClient.Sync.cs
+30 −28 CSRedis/RedisSentinelClient.cs
+23 −59 CSRedis/RedisSentinelManager.cs
+0 −0 LICENSE.md
+23 −40 README.md
+ csredis.pub.snk
9 changes: 3 additions & 6 deletions src/CoiniumServ/Persistance/Providers/Redis/RedisProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/CoiniumServ/Utils/Versions/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.*";
}
}
}

0 comments on commit 2ae178c

Please sign in to comment.