瀏覽代碼

feat(jvb): autoscaler sidecar shutdown hook on finish (#1906)

Aaron van Meerten 7 月之前
父節點
當前提交
e7cb0f4bca
共有 2 個文件被更改,包括 8 次插入5 次删除
  1. 1 1
      jvb/rootfs/etc/services.d/jvb/finish
  2. 7 4
      jvb/rootfs/opt/jitsi/shutdown.sh

+ 1 - 1
jvb/rootfs/etc/services.d/jvb/finish

@@ -5,5 +5,5 @@
 # services and shutdown the container.
 
 if [[ $1 -eq 0 ]]; then
-  s6-svscanctl -t /var/run/s6/services
+  /opt/jitsi/shutdown.sh
 fi

+ 7 - 4
jvb/rootfs/opt/jitsi/shutdown.sh

@@ -1,8 +1,11 @@
 #!/usr/bin/with-contenv bash
-# notify the sidecar of imminent shutdown
-PORT=${AUTOSCALER_SIDECAR_PORT:-6000}
-curl -d '{}' -v 0:$PORT/hook/v1/shutdown
-sleep 10
+
+if [ -n "$AUTOSCALER_URL" ]; then
+    # notify the sidecar of imminent shutdown
+    PORT=${AUTOSCALER_SIDECAR_PORT:-6000}
+    curl -d '{}' -v 0:$PORT/hook/v1/shutdown
+    sleep 10
+fi
 
 # shutdown everything
 s6-svscanctl -t /var/run/s6/services