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/24 05:16:27 UTC
karaf git commit: [KARAF-4260] Use karaf.base to store the wrapper
PID to avoid issue with clean.all start
Repository: karaf
Updated Branches:
refs/heads/master 64d2ef60a -> 8e6245066
[KARAF-4260] Use karaf.base to store the wrapper PID to avoid issue with clean.all start
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8e624506
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8e624506
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8e624506
Branch: refs/heads/master
Commit: 8e62450665d3f374fc791d1d0c4f96f210a9975d
Parents: 64d2ef6
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Fri Mar 24 06:15:32 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Fri Mar 24 06:15:32 2017 +0100
----------------------------------------------------------------------
.../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/8e624506/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 451dc0c..0c02420 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
@@ -40,7 +40,7 @@ PRIORITY=
DATADIR="${karaf.data}"
# Location of the pid file.
-PIDDIR="${karaf.data}"
+PIDDIR="${karaf.base}"
# If uncommented, causes the Wrapper to be shutdown using an anchor file.
# When launched with the 'start' command, it will also ignore all INT and
http://git-wip-us.apache.org/repos/asf/karaf/blob/8e624506/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 34d1f1b..1518f3c 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.data}/${name}.pid
+PIDFile=${karaf.base}/${name}.pid
ExecStart=${karaf.base}/bin/${name}-service start
ExecReload=${karaf.base}/bin/${name}-service restart
ExecStop=${karaf.base}/bin/${name}-service stop