Changeset c1b9aa9 for router

Timestamp:

May 26, 2018 11:46:59 AM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

39c0f55

Parents:

9eb3cc5

Message:

Router: Fix wrapper.config path in OOM message when installed as
Debian package, but not running as a service (ticket #2223)

Location:

router/java/src/net/i2p/router

Files:

• tasks/OOMListener.java (modified) (2 diffs)
• tunnel/BloomFilterIVValidator.java (modified) (3 diffs)

router/java/src/net/i2p/router/tasks/OOMListener.java

@@ -50 +50 @@
             log.log(Log.CRIT, "free mem: " + Runtime.getRuntime().freeMemory() + 
                               " total mem: " + Runtime.getRuntime().totalMemory());
-            // Can't find any System property or wrapper property that gives
-            // you the actual config file path, have to guess
-            String path;
-            if (SystemVersion.isLinuxService()) {
-                if (SystemVersion.isGentoo())
-                    path = "/usr/share/i2p";
-                else
-                    path = "/etc/i2p";
-            } else {
-                path = _context.getBaseDir().toString();
-            }
+            String path = getWrapperConfigPath(_context);
             if (_context.hasWrapper()) {
                 log.log(Log.CRIT, "To prevent future shutdowns, increase wrapper.java.maxmemory in " +
-                                  path + File.separatorChar + "wrapper.config");
+                                  path);
             } else if (!SystemVersion.isWindows()) {
                 log.log(Log.CRIT, "To prevent future shutdowns, increase MAXMEMOPT in " +
-                                  path + File.separatorChar + "runplain.sh or /usr/bin/i2prouter-nowrapper");
+                                  _context.getBaseDir() + File.separatorChar + "runplain.sh or /usr/bin/i2prouter-nowrapper");
             } else {
                 log.log(Log.CRIT, "To prevent future shutdowns, run the restartable version of I2P, and increase wrapper.java.maxmemory in " +
-                                  path + File.separatorChar + "wrapper.config");
+                                  path);
             }
         } catch (OutOfMemoryError oome) {}
@@ -82 +72 @@
         } catch (OutOfMemoryError oome) {}
     }
+
+    /**
+     *  Best guess if running from a Debian package
+     *  @since 0.9.35
+     */
+    private static boolean isDebianPackage(RouterContext ctx) {
+        boolean isDebian = !SystemVersion.isWindows() && !SystemVersion.isMac() &&
+                           !SystemVersion.isGentoo() && !SystemVersion.isAndroid() &&
+                           System.getProperty("os.name").startsWith("Linux") &&
+                           (new File("/etc/debian_version")).exists();
+        return isDebian &&
+               ctx.getBaseDir().getPath().equals("/usr/share/i2p") &&
+               ctx.getBooleanProperty("router.updateDisabled");
+    }
+
+    /**
+     *  Best guess of wrapper.config path.
+     *  Can't find any System property or wrapper property that gives
+     *  you the actual config file path, have to guess.
+     *  Does not necessarily exist.
+     *  @since 0.9.35 consolidated from above and BloomFilterIVValidator
+     */
+    public static String getWrapperConfigPath(RouterContext ctx) {
+        File path;
+        if (SystemVersion.isLinuxService()) {
+            if (SystemVersion.isGentoo())
+                path = new File("/usr/share/i2p");
+            else
+                path = new File("/etc/i2p");
+        } else if (isDebianPackage(ctx)) {
+            path = new File("/etc/i2p");
+        } else {
+            path = ctx.getBaseDir();
+        }
+        path = new File(path, "wrapper.config");
+        return path.getPath();
+    }
 }

router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java

@@ -5 +5 @@
 import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
+import net.i2p.router.tasks.OOMListener;
 import net.i2p.router.util.DecayingBloomFilter;
 import net.i2p.router.util.DecayingHashSet;
@@ -103 +104 @@
         if (SystemVersion.isAndroid())
             return;
-        // Can't find any System property or wrapper property that gives
-        // you the actual config file path, have to guess
-        String path;
-        if (SystemVersion.isLinuxService()) {
-            path = "/etc/i2p";
-        } else {
-            path = _context.getBaseDir().toString();
-        }
+        String path = OOMListener.getWrapperConfigPath(_context);
         String msg =
             "Configured for " + DataHelper.formatSize(KBps *1024L) +
@@ -117 +111 @@
         if (_context.hasWrapper()) {
             msg += " Recommend increasing wrapper.java.maxmemory in " +
-                   path + File.separatorChar + "wrapper.config";
+                   path;
         } else if (!SystemVersion.isWindows()) {
             msg += " Recommend increasing MAXMEMOPT in " +
-                   path + File.separatorChar + "runplain.sh or /usr/bin/i2prouter-nowrapper";
+                   _context.getBaseDir() + File.separatorChar + "runplain.sh or /usr/bin/i2prouter-nowrapper";
         } else {
             msg += " Recommend running the restartable version of I2P, and increasing wrapper.java.maxmemory in " +
-                   path + File.separatorChar + "wrapper.config";
+                   path;
         }
         // getMaxMemory() returns significantly lower than wrapper config, so add 10%