Update [pcr/i2p] and do some resyncing with upstream.

    rebase on the upstream but remove all the stuff to launch chromium (browser) Cause we dont have it.

1 files changed, 24 insertions, 13 deletions

diff --git a/pcr/i2p/wrapper.config b/pcr/i2p/wrapper.config
index 30271d537..1474aa02c 100644
--- a/pcr/i2p/wrapper.config
+++ b/pcr/i2p/wrapper.config
@@ -4,17 +4,15 @@
 #
 # WARNING - for any changes to take effect, you must completely
 # stop the router and the wrapper. Clicking 'Restart' on your
-# router console will NOT reread this file! You must
-# click "Shutdown", wait 11 minutes, then start i2p.
+# router console will NOT reload this file! You must
+# click "Shutdown", wait 10 minutes, then start i2p.
 #
 #********************************************************************
 # Java Application
 wrapper.java.command=/usr/lib/jvm/default/bin/java
 
 # Java Main class.  This class must implement the WrapperListener interface
-#  or guarantee that the WrapperManager class is initialized.  Helper
-#  classes are provided to do this for you.  See the Integration section
-#  of the documentation for details.
+#  or guarantee that the WrapperManager class is initialized.
 wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 
 # Java Classpath (include wrapper.jar)  Add class path elements as
@@ -51,10 +49,11 @@ wrapper.java.additional.4.stripquotes=TRUE
 wrapper.java.additional.7=-Djava.io.tmpdir=/opt/i2p/.tmp
 
 # Initial Java Heap Size (in MB)
+# Until jdk15, should be set same as maxmemory for best performance
 # If a non-zero value is specified for this property then an appropriate -Xms
 #  parameter will be added. The initial memory must be less than or equal to
 #  the value set for the maxmemory property
-#wrapper.java.initmemory=4
+wrapper.java.initmemory=128
 
 # Maximum Java Heap Size (in MB)
 # The JVM's default is 64MB, and I2P can work fine in that, but to handle
@@ -75,6 +74,7 @@ wrapper.app.parameter.1=net.i2p.router.Router
 wrapper.console.format=PM
 
 # Log Level for console output.  (See docs for log levels)
+# https://wrapper.tanukisoftware.com/doc/english/prop-console-loglevel.html
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
@@ -129,16 +129,12 @@ wrapper.jvm_exit.timeout=60
 # give the OS 60s to clear all the old sockets / etc before restarting
 # Let's change the default from 60 to 10 seconds and see if anyone moans..
 wrapper.restart.delay=5
+wrapper.restart.reload_configuration=TRUE
 
-wrapper.ping.interval=300
 # The ping timeout must be at least 5 seconds longer than the value of wrapper.ping.interval.
 # Extend this if you are getting 'JVM appears hung' shutdowns.
 wrapper.ping.timeout=320
-
-# use the wrapper's internal timer thread.  otherwise this would
-# force a restart of the router during daylight savings time as well
-# as any time that the OS clock changes
-wrapper.use_system_time=false
+wrapper.ping.interval=300
 
 # pid file for the JVM
 # If you plan to have multiple wrappers running on the same machine,
@@ -155,7 +151,7 @@ wrapper.java.pidfile=/run/i2p/i2p.pid
 wrapper.ignore_sequence_gaps=TRUE
 
 # Title to use when running as a console
-wrapper.console.title=I2P Service
+wrapper.console.title=I2P Router Service
 
 # Set permissions used when creating files
 # See http://wrapper.tanukisoftware.com/doc/english/prop-umask.html
@@ -163,3 +159,18 @@ wrapper.console.title=I2P Service
 wrapper.umask=0022
 wrapper.java.umask=0022
 wrapper.logfile.umask=077
+
+#********************************************************************
+# Wrapper JVM Checks
+#********************************************************************
+# Out Of Memory detection.
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+wrapper.filter.action.1=RESTART
+wrapper.filter.message.1=The JVM has run out of memory.
+
+#********************************************************************
+# Advanced Options
+#********************************************************************
+# Enable the Shenandoah Gargabe Collector
+#wrapper.java.additional.100=-XX:+UnlockExperimentalVMOptions
+#wrapper.java.additional.101=-XX:+UseShenandoahGC