Update on error scripts

mendix · Feb 4, 2025 · b1c20dd · b1c20dd
1 parent e1e496e
commit b1c20dd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/buildpack/core/runtime.py b/buildpack/core/runtime.py
@@ -630,14 +630,34 @@ def _pre_process_m2ee_yaml():
             f"s|BUILD_PATH|{os.getcwd()}|g; "
             f"s|RUNTIME_PORT|{util.get_runtime_port()}|; "
             f"s|ADMIN_PORT|{util.get_admin_port()}|; "
-            f"s|PYTHONPID|{os.getpid()}|", # TODO Replace in new scripts
             ".local/m2ee.yaml",
         ]
     )
 
 
+def _pre_process_on_error_scripts():
+    logging.debug("Preprocessing on error scripts...")
+    subprocess.check_call(
+        [
+            "sed",
+            "-i",
+            f"s|PYTHONPID|{os.getpid()}|",
+            ".local/scripts/on_error.sh",
+        ]
+    )
+    subprocess.check_call(
+        [
+            "sed",
+            "-i",
+            f"s|PYTHONPID|{os.getpid()}|",
+            ".local/scripts/on_out_of_memory_error.sh",
+        ]
+    )
+
+
 def setup(vcap_data):
     _pre_process_m2ee_yaml()
+    _pre_process_on_error_scripts()
     _activate_license()
 
     client = m2ee_class(

diff --git a/etc/m2ee/m2ee.yaml b/etc/m2ee/m2ee.yaml
@@ -26,7 +26,6 @@ m2ee:
       "-XX:OnError=/home/vcap/app/.local/scripts/on_error.sh",
       "-XX:OnOutOfMemoryError=/home/vcap/app/.local/scripts/on_out_of_memory_error.sh",
     ]
-  # TODO Replace with BUILD_PATH
 
   jetty:
     max_form_content_size: 10485760

diff --git a/etc/scripts/on_error.sh b/etc/scripts/on_error.sh
@@ -1,2 +1 @@
-echo "### THIS IS ON ERROR SCRIPT ###"
-# TODO Write actual signal command
+kill -s USR1 PYTHONPID
diff --git a/etc/scripts/on_out_of_memory_error.sh b/etc/scripts/on_out_of_memory_error.sh
@@ -1,2 +1 @@
-echo "### THIS IS ON OOM SCRIPT ###"
-# TODO Write actual signal command
+kill -s USR2 PYTHONPID