You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/03/27 16:28:28 UTC
karaf git commit: [KARAF-4260] Rename Service Wrapper pid file to not
clash with Karaf JVM pid file
Repository: karaf
Updated Branches:
refs/heads/karaf-4.0.x 0e88e07b4 -> 49ae5c991
[KARAF-4260] Rename Service Wrapper pid file to not clash with Karaf JVM pid file
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/49ae5c99
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/49ae5c99
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/49ae5c99
Branch: refs/heads/karaf-4.0.x
Commit: 49ae5c991bb88af25b4ae84e5986c5d98378f4b1
Parents: 0e88e07
Author: Vladimir Konkov <vk...@citc.ru>
Authored: Mon Mar 27 11:30:52 2017 +0300
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Mar 27 18:28:21 2017 +0200
----------------------------------------------------------------------
.../resources/org/apache/karaf/wrapper/internal/unix/karaf-service | 2 +-
.../resources/org/apache/karaf/wrapper/internal/unix/karaf.service | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/49ae5c99/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
index 0c02420..9597ff6 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
@@ -134,7 +134,7 @@ fi
# Process ID
ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
-PIDFILE="$PIDDIR/$APP_NAME.pid"
+PIDFILE="$PIDDIR/$APP_NAME.wrapper.pid"
LOCKDIR="/var/lock/subsys"
LOCKFILE="$LOCKDIR/$APP_NAME"
pid=""
http://git-wip-us.apache.org/repos/asf/karaf/blob/49ae5c99/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf.service
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf.service b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf.service
index 1518f3c..f7492e2 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf.service
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf.service
@@ -23,7 +23,7 @@ Description=${displayName}
[Service]
Type=forking
-PIDFile=${karaf.base}/${name}.pid
+PIDFile=${karaf.base}/${name}.wrapper.pid
ExecStart=${karaf.base}/bin/${name}-service start
ExecReload=${karaf.base}/bin/${name}-service restart
ExecStop=${karaf.base}/bin/${name}-service stop