Browse Source

revert save bandwidth

Some bugs on Save Bandwidth. Maybe commit again after all is ok.
tags/3.0
Gang Zhuo 8 years ago
parent
commit
fcec167c72
2 changed files with 0 additions and 8 deletions
  1. +0
    -6
      shadowsocks-csharp/Controller/ShadowsocksController.cs
  2. +0
    -2
      shadowsocks-csharp/Model/Server.cs

+ 0
- 6
shadowsocks-csharp/Controller/ShadowsocksController.cs View File

@@ -63,8 +63,6 @@ namespace Shadowsocks.Controller
public ShadowsocksController() public ShadowsocksController()
{ {
_config = Configuration.Load(); _config = Configuration.Load();
inboundCounter = _config.GetCurrentServer().bandwidthIn;
outboundCounter = _config.GetCurrentServer().bandwidthOut;
StatisticsConfiguration = StatisticsStrategyConfiguration.Load(); StatisticsConfiguration = StatisticsStrategyConfiguration.Load();
_strategyManager = new StrategyManager(this); _strategyManager = new StrategyManager(this);
StartReleasingMemory(); StartReleasingMemory();
@@ -312,21 +310,17 @@ namespace Shadowsocks.Controller
public void UpdateInboundCounter(long n) public void UpdateInboundCounter(long n)
{ {
Interlocked.Add(ref inboundCounter, n); Interlocked.Add(ref inboundCounter, n);
_config.GetCurrentServer().bandwidthIn = inboundCounter;
} }
public void UpdateOutboundCounter(long n) public void UpdateOutboundCounter(long n)
{ {
Interlocked.Add(ref outboundCounter, n); Interlocked.Add(ref outboundCounter, n);
_config.GetCurrentServer().bandwidthOut = outboundCounter;
} }
protected void Reload() protected void Reload()
{ {
// some logic in configuration updated the config when saving, we need to read it again // some logic in configuration updated the config when saving, we need to read it again
_config = Configuration.Load(); _config = Configuration.Load();
inboundCounter = _config.GetCurrentServer().bandwidthIn;
outboundCounter = _config.GetCurrentServer().bandwidthOut;
StatisticsConfiguration = StatisticsStrategyConfiguration.Load(); StatisticsConfiguration = StatisticsStrategyConfiguration.Load();
if (polipoRunner == null) if (polipoRunner == null)


+ 0
- 2
shadowsocks-csharp/Model/Server.cs View File

@@ -15,8 +15,6 @@ namespace Shadowsocks.Model
public string method; public string method;
public string remarks; public string remarks;
public bool auth; public bool auth;
public long bandwidthIn;
public long bandwidthOut;
public override int GetHashCode() public override int GetHashCode()
{ {


Loading…
Cancel
Save