marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix un-migrated and monolithic config saving

Browse Source
This commit is contained in:
hankhill19580
2019-06-09 02:20:23 +00:00
parent 357feca7b1
commit 2918d6006f
1 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
View File

@ -20,6 +20,8 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import net.i2p.util.FileSuffixFilter;
import net.i2p.I2PAppContext;
import net.i2p.app.*;
import static net.i2p.app.ClientAppState.*;
@ -290,13 +292,35 @@ public class TunnelControllerGroup implements ClientApp {
if (_controllersLoaded)
return;
try {
boolean shouldMigrate = false;//_context.isRouterContext() && !SystemVersion.isAndroid() && !_context.getConfigDir().getCanonicalPath().equals(_context.getBaseDir().getCanonicalPath());
loadControllers(configFile, shouldMigrate);
boolean shouldMigrate = _context.isRouterContext() && !SystemVersion.isAndroid() && !_context.getConfigDir().getCanonicalPath().equals(_context.getBaseDir().getCanonicalPath());
loadControllers(configFile, shouldMigrate());
} catch (IOException ioe){
loadControllers(configFile, false);
}
}
/**
* Detects whether a migration to split configuration files should/will/has
* happened based on the platform and installation type. Does not tell
* whether a migration has actually occurred.
*
* @returns true if a migration is relevant to the platform, false if not
*/
public boolean shouldMigrate() {
try {
if (_context.isRouterContext()) {
if (!SystemVersion.isAndroid()) {
if (!_context.getConfigDir().getCanonicalPath().equals(_context.getBaseDir().getCanonicalPath())) {
return true;
}
}
}
} catch (IOException ioe) {
return false;
}
return false;
}
/**
* @param shouldMigrate migrate to, and load from, i2ptunnel.config.d
* @since 0.9.34
@ -629,12 +653,20 @@ public class TunnelControllerGroup implements ClientApp {
@Deprecated
public void saveConfig() throws IOException {
_controllersLock.readLock().lock();
try {
for (TunnelController controller : _controllers) {
saveConfig(controller);
if (shouldMigrate()) {
try {
for (TunnelController controller : _controllers) {
saveConfig(controller);
}
} finally {
_controllersLock.readLock().unlock();
}
}else {
try {
saveConfig(_configFile);
} finally {
_controllersLock.readLock().unlock();
}
} finally {
_controllersLock.readLock().unlock();
}
}
@ -650,19 +682,17 @@ public class TunnelControllerGroup implements ClientApp {
File parent = cfgFile.getParentFile();
if ( (parent != null) && (!parent.exists()) )
parent.mkdirs();
Properties map = new OrderedProperties();
_controllersLock.readLock().lock();
try {
for (int i = 0; i < _controllers.size(); i++) {
TunnelController controller = _controllers.get(i);
Properties cur = controller.getConfig(PREFIX);
Properties cur = controller.getConfig(PREFIX + i + ".");
map.putAll(cur);
}
} finally {
_controllersLock.readLock().unlock();
}
DataHelper.storeProps(map, cfgFile);
}
@ -673,7 +703,6 @@ public class TunnelControllerGroup implements ClientApp {
public synchronized void saveConfig(TunnelController tc) throws IOException {
_log.logAlways(Log.WARN, "Saving tunnel configuration");
Properties inputController = tc.getConfig("");
String inputName = inputController.getProperty("name");
Properties map = new OrderedProperties();
File cfgFile = assureConfigFile(tc);
@ -730,6 +759,9 @@ public class TunnelControllerGroup implements ClientApp {
if (fileName == null)
configFileName = _controllers.size() + "-tunnel-i2ptunnel.config";
if (_controllers.size() < 10)
configFileName = '0' + configFileName;
File file = new File(configFileName);
if (!file.isAbsolute()) {
File folder = new File(_configDirectory);