Skip to content

Commit

Permalink
Removed DaemonManagerConfig.cs and StandaloneDaemonConfig.cs - as we …
Browse files Browse the repository at this point in the history
…don't need stand-alone deaemons configuration for auto-exchanges.

Removed daemons-example.json.
  • Loading branch information
bonesoul committed Oct 25, 2014
1 parent 709f9d7 commit 9180be4
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 294 deletions.
4 changes: 0 additions & 4 deletions src/CoiniumServ/CoiniumServ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@
<Compile Include="Algorithms\X14.cs" />
<Compile Include="Algorithms\X15.cs" />
<Compile Include="Algorithms\X17.cs" />
<Compile Include="Daemon\Config\DaemonManagerConfig.cs" />
<Compile Include="Daemon\Config\IDaemonManagerConfig.cs" />
<Compile Include="Factories\ConfigFactory.cs" />
<Compile Include="Factories\IConfigFactory.cs" />
<Compile Include="Factories\IObjectFactory.cs" />
Expand Down Expand Up @@ -223,11 +221,9 @@
<Compile Include="Mining\Software\IMiningSoftware.cs" />
<Compile Include="Daemon\IDaemonManager.cs" />
<Compile Include="Daemon\DaemonManager.cs" />
<Compile Include="Daemon\Config\IStandaloneDaemonConfig.cs" />
<Compile Include="Payments\Config\IRewardsConfig.cs" />
<Compile Include="Jobs\Manager\JobConfig.cs" />
<Compile Include="Mining\MinerConfig.cs" />
<Compile Include="Daemon\Config\StandaloneDaemonConfig.cs" />
<Compile Include="Persistance\Query\PaginationQuery.cs" />
<Compile Include="Server\Web\Models\Algorithm\AlgorithmsModel.cs" />
<Compile Include="Server\Web\Models\Pool\PoolsModel.cs" />
Expand Down
13 changes: 0 additions & 13 deletions src/CoiniumServ/Configuration/ConfigManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ public class ConfigManager:IConfigManager
public ILogConfig LogConfig { get; private set; }

public List<IPoolConfig> PoolConfigs { get; private set; }

public IDaemonManagerConfig DaemonManagerConfig { get; private set; }

public ISoftwareRepositoryConfig SoftwareRepositoryConfig { get; private set; }

Expand All @@ -82,7 +80,6 @@ public ConfigManager(IConfigFactory configFactory, IJsonConfigReader jsonConfigR
_logger = Log.ForContext<ConfigManager>();

LoadGlobalConfig(); // read the global config.
// LoadDaemonManagerConfig(); // load the global daemon manager config. - disabled until we need it.
LoadSoftwareManagerConfig(); // load software manager config file.
LoadDefaultPoolConfig(); // load default pool config if exists.
LoadPoolConfigs(); // load the per-pool config files.
Expand Down Expand Up @@ -171,16 +168,6 @@ private void LoadPoolConfigs()
PoolConfigs.Select(config => config.Coin.Name).ToList());
}

private void LoadDaemonManagerConfig()
{
var data = _jsonConfigReader.Read(DaemonManagerConfigFilename); // read the global config data.

if (data == null) // if we can't read daemon manager config file.
data = new ExpandoObject(); // create a fake object.

DaemonManagerConfig = _configFactory.GetDaemonManagerConfig(data);
}

public ICoinConfig GetCoinConfig(string name)
{
var fileName = string.Format("{0}/{1}.json", CoinConfigRoot, name);
Expand Down
2 changes: 0 additions & 2 deletions src/CoiniumServ/Configuration/IConfigManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ public interface IConfigManager

List<IPoolConfig> PoolConfigs { get; }

IDaemonManagerConfig DaemonManagerConfig { get; }

ISoftwareRepositoryConfig SoftwareRepositoryConfig { get; }

ICoinConfig GetCoinConfig(string name);
Expand Down
2 changes: 0 additions & 2 deletions src/CoiniumServ/Container/Registries/ClassRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ public void RegisterInstances()
_applicationContext.Container.Register<IJsonConfigReader, JsonConfigReader>().AsSingleton();
_applicationContext.Container.Register<IPoolConfig, PoolConfig>().AsMultiInstance();
_applicationContext.Container.Register<ICoinConfig, CoinConfig>().AsMultiInstance();
_applicationContext.Container.Register<IDaemonManagerConfig, DaemonManagerConfig>().AsMultiInstance(); // todo: this should be singleton!
_applicationContext.Container.Register<IStandaloneDaemonConfig, StandaloneDaemonConfig>().AsMultiInstance();
_applicationContext.Container.Register<IMiningSoftwareConfig, MiningSoftwareConfig>().AsMultiInstance();

// web
Expand Down
61 changes: 0 additions & 61 deletions src/CoiniumServ/Daemon/Config/DaemonManagerConfig.cs

This file was deleted.

33 changes: 0 additions & 33 deletions src/CoiniumServ/Daemon/Config/IDaemonManagerConfig.cs

This file was deleted.

37 changes: 0 additions & 37 deletions src/CoiniumServ/Daemon/Config/IStandaloneDaemonConfig.cs

This file was deleted.

83 changes: 0 additions & 83 deletions src/CoiniumServ/Daemon/Config/StandaloneDaemonConfig.cs

This file was deleted.

19 changes: 0 additions & 19 deletions src/CoiniumServ/Daemon/DaemonManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public DaemonManager(IPoolManager poolManager, IConfigManager configManager, IOb
_storage = new Dictionary<string, IDaemonClient>(); // initialize the daemon storage.

ReadPoolDaemons(); // read pool daemons.
// LoadPaymentDaemons(); // load payment daemons. - disabled until we need it.
}

private void ReadPoolDaemons()
Expand All @@ -69,24 +68,6 @@ private void ReadPoolDaemons()
}
}

private void LoadPaymentDaemons()
{
foreach (var config in _configManager.DaemonManagerConfig.Configs)
{
if (!config.Enabled)
continue;

if (_storage.ContainsKey(config.Coin.Symbol))
{
_logger.Error("Can not add stand-alone daemon config as there already exists a daemon connection for {0:l}", config.Coin.Name);
continue;
}

var daemon = _objectFactory.GetDaemonClient(config.Daemon, config.Coin);
_storage.Add(config.Coin.Symbol, daemon);
}
}

public IEnumerator<IDaemonClient> GetEnumerator()
{
return _storage.Values.GetEnumerator();
Expand Down
20 changes: 0 additions & 20 deletions src/CoiniumServ/Factories/ConfigFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,6 @@ public ICoinConfig GetCoinConfig(dynamic config)
return _applicationContext.Container.Resolve<ICoinConfig>(@params);
}

public IDaemonManagerConfig GetDaemonManagerConfig(dynamic config)
{
var @params = new NamedParameterOverloads
{
{"config", config},
};

return _applicationContext.Container.Resolve<IDaemonManagerConfig>(@params);
}

public IStandaloneDaemonConfig GetStandaloneDaemonConfig(dynamic config)
{
var @params = new NamedParameterOverloads
{
{"config", config},
};

return _applicationContext.Container.Resolve<IStandaloneDaemonConfig>(@params);
}

public IMiningSoftwareConfig GetMiningSoftwareConfig(dynamic config)
{
var @params = new NamedParameterOverloads
Expand Down
5 changes: 0 additions & 5 deletions src/CoiniumServ/Factories/IConfigFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

using CoiniumServ.Coin.Config;
using CoiniumServ.Configuration;
using CoiniumServ.Daemon.Config;
using CoiniumServ.Mining.Software;
using CoiniumServ.Pools;

Expand All @@ -42,10 +41,6 @@ public interface IConfigFactory

ICoinConfig GetCoinConfig(dynamic config);

IDaemonManagerConfig GetDaemonManagerConfig(dynamic config);

IStandaloneDaemonConfig GetStandaloneDaemonConfig(dynamic config);

IMiningSoftwareConfig GetMiningSoftwareConfig(dynamic config);
}
}
15 changes: 0 additions & 15 deletions src/CoiniumServ/config/daemons-example.json

This file was deleted.

0 comments on commit 9180be4

Please sign in to comment.