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

Logs: Correct wrapper.config location when running as a Linux service

Browse Source
This commit is contained in:
zzz
2015-06-07 12:44:29 +00:00
parent 0936a2ee23
commit 384e9118c6
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
router/java/src/net/i2p/router/tasks/OOMListener.java
View File

@ -8,6 +8,7 @@ import net.i2p.router.RouterContext;
import net.i2p.router.util.EventLog;
import net.i2p.util.I2PThread;
import net.i2p.util.Log;
import net.i2p.util.SystemVersion;
/**
* Kaboom
@ -48,9 +49,19 @@ public class OOMListener implements I2PThread.OOMEventListener {
log.log(Log.CRIT, "Thread ran out of memory, shutting down I2P", oom);
log.log(Log.CRIT, "free mem: " + Runtime.getRuntime().freeMemory() +
" total mem: " + Runtime.getRuntime().totalMemory());
if (_context.hasWrapper())
if (_context.hasWrapper()) {
// Can't find any System property or wrapper property that gives
// you the actual config file path, have to guess
String path;
if (!SystemVersion.isWindows() && !SystemVersion.isMac() &&
"i2psvc".equals(System.getProperty("user.name"))) {
path = "/etc/i2p";
} else {
path = _context.getBaseDir().toString();
}
log.log(Log.CRIT, "To prevent future shutdowns, increase wrapper.java.maxmemory in " +
_context.getBaseDir() + File.separatorChar + "wrapper.config");
path + File.separatorChar + "wrapper.config");
}
} catch (OutOfMemoryError oome) {}
try {
ThreadDump.dump(_context, 1);

12
router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java
View File

@ -96,12 +96,22 @@ class BloomFilterIVValidator implements IVValidator {
private void warn(long maxMemory, int KBps, long recMaxMem, int threshKBps) {
if (SystemVersion.isAndroid())
return;
// Can't find any System property or wrapper property that gives
// you the actual config file path, have to guess
// TODO if !SystemVersion.hasWrapper ...
String path;
if (!SystemVersion.isWindows() && !SystemVersion.isMac() &&
"i2psvc".equals(System.getProperty("user.name"))) {
path = "/etc/i2p";
} else {
path = _context.getBaseDir().toString();
}
String msg =
"Configured for " + DataHelper.formatSize(KBps *1024) +
"Bps share bandwidth but only " +
DataHelper.formatSize(maxMemory) + "B available memory." +
" Recommend increasing wrapper.java.maxmemory in " +
_context.getBaseDir() + File.separatorChar + "wrapper.config" +
path + File.separatorChar + "wrapper.config" +
// getMaxMemory() returns significantly lower than wrapper config, so add 10%
" to at least " + (recMaxMem * 11 / 10 / (1024*1024)) + " (MB)" +
" if the actual share bandwidth exceeds " +