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

i2psnark: Better handling of read-only i2psnark dir (ticket #1990)

Browse Source 
Prevent add/create/remove/delete
More handling of RuntimeException via Snark.fatal() in SnarkManager
This commit is contained in:
zzz
2017-05-12 17:16:25 +00:00
parent 93cb2a0513
commit b340f4a17c
3 changed files with 66 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@@ -731,7 +731,7 @@ public class SnarkManager implements CompleteListener, ClientApp {
return new SHA1Hash(ih);
}
/** null to set initial defaults */
/** @param filename null to set initial defaults */
public void loadConfig(String filename) {
synchronized(_configLock) {
locked_loadConfig(filename);
@@ -896,7 +896,14 @@ public class SnarkManager implements CompleteListener, ClientApp {
_util.setRatingsEnabled(Boolean.parseBoolean(_config.getProperty(PROP_RATINGS, "true")));
_util.setCommentsEnabled(Boolean.parseBoolean(_config.getProperty(PROP_COMMENTS, "true")));
_util.setCommentsName(_config.getProperty(PROP_COMMENTS_NAME, ""));
getDataDir().mkdirs();
File dd = getDataDir();
if (dd.isDirectory()) {
if (!dd.canWrite())
addMessage(_t("No write permissions for data directory") + ": " + dd);
} else {
if (!dd.mkdirs())
addMessage(_t("Data directory cannot be created") + ": " + dd);
}
initTrackerMap();
}
@@ -1031,6 +1038,8 @@ public class SnarkManager implements CompleteListener, ClientApp {
} else if (!dd.canRead()) {
addMessage(_t("Unreadable") + ": " + dataDir);
} else {
if (!dd.canWrite())
addMessage(_t("No write permissions for data directory") + ": " + dataDir);
changed = true;
interruptMonitor = true;
_config.setProperty(PROP_DIR, dataDir);
@@ -2640,6 +2649,7 @@ public class SnarkManager implements CompleteListener, ClientApp {
/**
* If not connected, thread it, otherwise inline
* @throws RuntimeException via Snark.fatal()
* @since 0.9.1
*/
public void startTorrent(byte[] infoHash) {
@@ -2654,6 +2664,7 @@ public class SnarkManager implements CompleteListener, ClientApp {
/**
* If not connected, thread it, otherwise inline
* @throws RuntimeException via Snark.fatal()
* @since 0.9.23
*/
public void startTorrent(Snark snark) {
@@ -2701,17 +2712,14 @@ public class SnarkManager implements CompleteListener, ClientApp {
private final Snark snark;
public ThreadedStarter(Snark s) { snark = s; }
public void run() {
try {
run2();
} catch (RuntimeException e) {
_log.error("Error starting", e);
}
}
private void run2() {
if (snark != null) {
if (snark.isStopped())
snark.startTorrent();
if (snark.isStopped()) {
try {
snark.startTorrent();
} catch (RuntimeException re) {
// Snark.fatal() will log and call fatal() here for user message before throwing
}
}
} else {
startAll();
}
@@ -2724,8 +2732,13 @@ public class SnarkManager implements CompleteListener, ClientApp {
*/
private void startAll() {
for (Snark snark : _snarks.values()) {
if (snark.isStopped())
snark.startTorrent();
if (snark.isStopped()) {
try {
snark.startTorrent();
} catch (RuntimeException re) {
// Snark.fatal() will log and call fatal() here for user message before throwing
}
}
}
}