From f6710465ef06dfa62029dd31fde24e90e97e847e Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Wed, 18 May 2016 17:04:14 +0300
Subject: [PATCH] dist: change scylla-jmx process name from 'java' to
 'scylla-jmx'

Helps in top, pgrep and friends.  Unfortunately the only reasonable way
to do it is to create a symlink to /usr/bin/java and run that.
Message-Id: <1463580254-8369-1-git-send-email-avi@scylladb.com>
---
 dist/redhat/scylla-jmx.spec.in | 3 +++
 dist/ubuntu/rules.in           | 2 ++
 scripts/scylla-jmx             | 4 +++-
 scripts/symlinks/scylla-jmx    | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 120000 scripts/symlinks/scylla-jmx

diff --git a/dist/redhat/scylla-jmx.spec.in b/dist/redhat/scylla-jmx.spec.in
index 0f73f4e..5bcdb14 100644
--- a/dist/redhat/scylla-jmx.spec.in
+++ b/dist/redhat/scylla-jmx.spec.in
@@ -32,8 +32,10 @@ install -m644 dist/common/sysconfig/scylla-jmx $RPM_BUILD_ROOT%{_sysconfdir}/sys
 install -m644 dist/redhat/systemd/scylla-jmx.service $RPM_BUILD_ROOT%{_unitdir}/
 install -d -m755 $RPM_BUILD_ROOT%{_prefix}/lib/scylla
 install -d -m755 $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx
+install -d -m755 $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx/symlinks
 install -m644 target/scylla-jmx-1.0.jar $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx/
 install -m755 scripts/scylla-jmx $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx
+ln -sf /usr/bin/java $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx/symlinks/scylla-jmx
 
 %pre
 /usr/sbin/groupadd scylla 2> /dev/null || :
@@ -68,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_unitdir}/scylla-jmx.service
 %{_prefix}/lib/scylla/jmx/scylla-jmx
 %{_prefix}/lib/scylla/jmx/scylla-jmx-1.0.jar
+%{_prefix}/lib/scylla/jmx/symlinks/scylla-jmx
 
 %changelog
 * Fri Aug  7 2015 Takuya ASADA Takuya ASADA <syuu@cloudius-systems.com>
diff --git a/dist/ubuntu/rules.in b/dist/ubuntu/rules.in
index d63103b..fe2cd97 100755
--- a/dist/ubuntu/rules.in
+++ b/dist/ubuntu/rules.in
@@ -22,6 +22,8 @@ override_dh_auto_install:
 	mkdir -p $(DEST)
 	cp $(CURDIR)/scripts/scylla-jmx $(DEST)
 	cp $(CURDIR)/target/scylla-jmx-1.0.jar $(DEST)
+	mkdir $(DEST)/symlinks
+	ln -sf /usr/bin/java $(DEST)/symlinks/scylla-jmx
 
 override_dh_installinit:
 	dh_installinit --no-start @@DH_INSTALLINIT@@
diff --git a/scripts/scylla-jmx b/scripts/scylla-jmx
index 1f5557e..9e7a863 100755
--- a/scripts/scylla-jmx
+++ b/scripts/scylla-jmx
@@ -13,6 +13,7 @@ PARAM_API_PORT="-p"
 PARAM_ADDR="-a"
 PARAM_LOCATION="-l"
 LOCATION="target"
+LOCATION_SCRIPTS="scripts"
 PARAM_FILE="-cf"
 ALLOW_REMOTE="-r"
 ALLOW_DEBUG="-d"
@@ -61,6 +62,7 @@ do
       ;;
     "$PARAM_LOCATION")
       LOCATION=$2
+      LOCATION_SCRIPTS="$2"
       shift 2
       ;;
     "$PARAM_FILE")
@@ -90,4 +92,4 @@ else
   REMOTE="-Dcassandra.jmx.local.port=$JMX_PORT"
 fi
 
-exec java $API_ADDR $API_PORT $DEBUG $CONF_FILE $REMOTE -Xmx256m -XX:+UseSerialGC -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -jar $LOCATION/scylla-jmx-1.0.jar
+exec "$LOCATION_SCRIPTS"/symlinks/scylla-jmx $API_ADDR $API_PORT $DEBUG $CONF_FILE $REMOTE -Xmx256m -XX:+UseSerialGC -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -jar $LOCATION/scylla-jmx-1.0.jar
diff --git a/scripts/symlinks/scylla-jmx b/scripts/symlinks/scylla-jmx
new file mode 120000
index 0000000..33b0c18
--- /dev/null
+++ b/scripts/symlinks/scylla-jmx
@@ -0,0 +1 @@
+/usr/bin/java
\ No newline at end of file