lower default stack size, cleanup wrapper

4 files changed, 29 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b998a1119c3e..071aad3b1f0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,8 +27,8 @@ pkgbase = freenet
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = 1eb5ed6d92a3ab8a825dd715fd2418c253ef5a431943dc6f0bdf6c70252a2f945ea89d6c0b412cdb7b7898262add0d1dd36050c1be2386a263153608ff7ff791
-	b2sums = e4aa6fbd35a0d0fd58b67700c11aa3712371af7889405faf4a49dfd733387b04929a294f5bad8678e328f96eaf4cad227f6b6e4d99e203cfeed616d7383c7c36
+	b2sums = 043589015aced4a9828518db5a7207382c782ff7f0f5bc2c5ad19ff559fc7f695bcd503e717bfb19bee8338abdf0b30f418a155e9c86f5016162ccad4870d82a
+	b2sums = 5ea353c01f61dbae518e2114efe5d9ccf7d741853f6fee34b9eef9e1a3b4e6ce8c16b94abaf7164392242424a27d38a2bb7b63a20c6d8ec77e43252ff6125182
 	b2sums = 83a374354b4ade822e6ecdc0b08013ac6c1c7dd3071478d4017e998ec031a1f3d0731f76eb8470e36bf8e77f7bbe1310d8d0cf5726929fcc6db81a90cc802d04
 	b2sums = 540c911bbccea18ed2b5ad22864040b83674833746536e869ec8491974f0265239c7b4c12fb1e43f27126320adc9206d81249c5e0c9e7ce6ef2aeb46b8f9cf5b
 	b2sums = 54828750ac0283e4328635bb61d0edd695391d433d85a6612b2288520a58b40b312d5759b38487e093e150aedee3659e6bed3827d936171d2d252aea2cbced1d
diff --git a/PKGBUILD b/PKGBUILD
index 79fb0394f558..b8e4d41cdc14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,8 +32,8 @@ source=("git+https://github.com/freenet/fred.git?signed#tag=$_fred"
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
-        '1eb5ed6d92a3ab8a825dd715fd2418c253ef5a431943dc6f0bdf6c70252a2f945ea89d6c0b412cdb7b7898262add0d1dd36050c1be2386a263153608ff7ff791'
-        'e4aa6fbd35a0d0fd58b67700c11aa3712371af7889405faf4a49dfd733387b04929a294f5bad8678e328f96eaf4cad227f6b6e4d99e203cfeed616d7383c7c36'
+        '043589015aced4a9828518db5a7207382c782ff7f0f5bc2c5ad19ff559fc7f695bcd503e717bfb19bee8338abdf0b30f418a155e9c86f5016162ccad4870d82a'
+        '5ea353c01f61dbae518e2114efe5d9ccf7d741853f6fee34b9eef9e1a3b4e6ce8c16b94abaf7164392242424a27d38a2bb7b63a20c6d8ec77e43252ff6125182'
         '83a374354b4ade822e6ecdc0b08013ac6c1c7dd3071478d4017e998ec031a1f3d0731f76eb8470e36bf8e77f7bbe1310d8d0cf5726929fcc6db81a90cc802d04'
         '540c911bbccea18ed2b5ad22864040b83674833746536e869ec8491974f0265239c7b4c12fb1e43f27126320adc9206d81249c5e0c9e7ce6ef2aeb46b8f9cf5b'
         '54828750ac0283e4328635bb61d0edd695391d433d85a6612b2288520a58b40b312d5759b38487e093e150aedee3659e6bed3827d936171d2d252aea2cbced1d')
diff --git a/run.sh b/run.sh
index d57cb77b0407..71f1f1022f73 100644
--- a/run.sh
+++ b/run.sh
@@ -5,7 +5,7 @@ _USER="freenet"
 WRAPPER_CMD="/usr/bin/java-service-wrapper"
 WRAPPER_CONF="/opt/freenet/wrapper.config"
 PIDFILE="/run/freenet/freenet.pid"
-TIMEOUT=120
+TIMEOUT=60
 #-----------------------------------------------------------------------------
 
 fail() {
@@ -15,7 +15,7 @@ fail() {
 
 check_user() {
     if [[ "$(id -un)" != "$_USER" ]]; then
-        SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)/$(basename $0)"
+        SCRIPT_PATH="$(readlink -f "$0")"
         su - "$_USER" -c "${SCRIPT_PATH} $@"
         exit $?
     fi
@@ -35,27 +35,25 @@ get_wrapper_pid() {
     pgrep -u "$_USER" -f 'wrapper.name=freenet'
 }
 get_pid() {
-    pgrep -u "$_USER" -f 'jar'
+    pgrep -u "$_USER" -f 'jar.*freenet'
 }
 
 check_if_running() {
     unset pid
-    if [[ -f "$PIDFILE" ]]; then
-        if [[ -r "$PIDFILE" ]]; then
-            pid=$(cat "$PIDFILE")
+    if [[ -r "$PIDFILE" ]]; then
+        pid=$(cat "$PIDFILE")
+        if [[ ! "$pid" ]]; then
+            pid=$(get_pid)
             if [[ ! "$pid" ]]; then
-                pid=$(get_pid)
-                if [[ ! "$pid" ]]; then
-                    echo "Removing stale pid file: $PIDFILE"
-                    rm -f "$PIDFILE"
-                fi
-            else
-                [[ "$pid" -ne "$(get_pid)" ]] &&
-                    fail "\$PIDFILE $PIDFILE differs from what is actually running!"
+                echo "Removing stale pid file: $PIDFILE"
+                rm -f "$PIDFILE"
             fi
         else
-            fail "Cannot read \$PIDFILE: $PIDFILE"
+            [[ "$pid" -ne "$(get_pid)" ]] &&
+                fail "\$PIDFILE $PIDFILE differs from what is actually running!"
         fi
+    # else
+    #     echo "check_if_running: pid: $pid"
     fi
 }
 
@@ -70,18 +68,18 @@ _console() {
 
 _start() {
     if [[ ! "$pid" ]]; then
-        echo -n "Starting Freenet"
+        echo -n "Starting Freenet..."
         COMMAND_LINE+=" wrapper.daemonize=TRUE"
         eval "$COMMAND_LINE" || fail "Failed to launch the wrapper!"
         i=0
-        while [[ ! "$pid" || $i -lt $TIMEOUT ]]; do
+        while [[ ! "$pid" && $i -lt $TIMEOUT ]]; do
             echo -n "."
             sleep 1
             check_if_running
             ((i++))
         done
         [[ $(get_pid) ]] &&
-            echo " done" || fail "timeout: Failed to start wrapper!"
+            echo " ok" || fail "timeout: Failed to start wrapper!"
     else
         echo "Freenet is already running! (pid: $pid)"
     fi
@@ -94,7 +92,7 @@ _restart() {
 
 _stop() {
     if [[ "$pid" ]]; then
-        echo "Stopping Freenet, this will take a few minutes"
+        echo -n "Stopping Freenet, this could take a minute..."
         kill -TERM "$(get_wrapper_pid)" || fail "Unable to stop Freenet: kill -TERM $pid"
         i=0
         while [[ "$pid" || $i -gt $TIMEOUT ]]; do
@@ -104,9 +102,9 @@ _stop() {
             ((i++))
         done
         [[ "$pid" ]] &&
-            fail "timeout: Failed to stop wrapper! (pid: $pid)" || echo " done"
+            fail "timeout: Failed to stop wrapper! (pid: $pid)" || echo " ok"
     else
-        echo "Freenet is not running."
+        echo "Freenet is not running"
     fi
 }
 
@@ -115,7 +113,7 @@ _dump() {
         kill -QUIT "$pid" || fail "Failed to dump Freenet Service"
         echo "Thread Dump is available in wrapper.log"
     else
-        echo "Freenet is not running."
+        echo "Freenet is not running"
     fi
 }
 #-----------------------------------------------------------------------------
diff --git a/wrapper.config b/wrapper.config
index c6b523b5e80a..3fdd2f20467a 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -40,7 +40,10 @@ wrapper.java.additional.7=--add-opens=java.base/java.lang=ALL-UNNAMED
 wrapper.java.additional.8=--add-opens=java.base/java.net=ALL-UNNAMED
 wrapper.java.additional.9=--add-opens=java.base/java.util=ALL-UNNAMED
 
-# Maximum Java Heap Size (in MB)
+# Thread Stack Size
+wrapper.java.additional.10=-Xss256k
+
+# Maximum Heap Size (in MB)
 wrapper.java.maxmemory=512
 
 # Application parameters. Add parameters as needed starting from 1
@@ -151,7 +154,7 @@ wrapper.filter.message.1=The JVM has run out of memory.
 #wrapper.request_thread_dump_on_failed_jvm_exit=TRUE
 
 #********************************************************************
-# Advanced Options
+# Advanced Options - https://docs.oracle.com/en/java/javase/17/docs/specs/man/java.html
 #********************************************************************
 # Enable the Shenandoah Garbage Collector
 wrapper.java.additional.101=-XX:+UseShenandoahGC