Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hhvm: hhvm-dump-debug compatibility with jessie
......................................................................
hhvm: hhvm-dump-debug compatibility with jessie
Change-Id: I14ab7dbaf5b9624f25a10d2032336ddac184be19
---
M modules/hhvm/files/debug/hhvm-dump-debug
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/files/debug/hhvm-dump-debug
b/modules/hhvm/files/debug/hhvm-dump-debug
index e628e23..b21d6e5 100755
--- a/modules/hhvm/files/debug/hhvm-dump-debug
+++ b/modules/hhvm/files/debug/hhvm-dump-debug
@@ -8,8 +8,13 @@
. /etc/default/hhvm || die
-read PID <"${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid"
-case $PID in ''|*[!0-9]*)
+if [ -x /bin/systemctl ]; then
+ PID=$(/bin/systemctl show -p MainPID hhvm.service | cut -d= -f2)
+else
+ read PID <"${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid"
+fi;
+
+case $PID in 0|''|*[!0-9]*)
die "Can't find PID file of HHVM." ;;
esac
--
To view, visit https://gerrit.wikimedia.org/r/282358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14ab7dbaf5b9624f25a10d2032336ddac184be19
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
