karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [1/2] karaf git commit: [KARAF-4260] Rename Service Wrapper pid file to not clash with Karaf JVM pid file
Date Mon, 27 Mar 2017 16:28:04 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 60b19f82f -> 1c6b46323


[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/5d033cd9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5d033cd9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5d033cd9

Branch: refs/heads/master
Commit: 5d033cd937e09a71f03985caf502cd1737a52dec
Parents: 60b19f8
Author: Vladimir Konkov <vkonkov@citc.ru>
Authored: Mon Mar 27 11:30:52 2017 +0300
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Mar 27 18:11:12 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/5d033cd9/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/5d033cd9/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


Mime
View raw message