karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-4260] Use karaf.base to store the wrapper PID to avoid issue with clean.all start
Date Fri, 24 Mar 2017 05:16:42 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 3293f91b6 -> 0d6be2201


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

Branch: refs/heads/karaf-4.0.x
Commit: 0d6be2201861f9c75ee8a542d6906f83a863c736
Parents: 3293f91
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Fri Mar 24 06:15:32 2017 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Fri Mar 24 06:16:37 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/0d6be220/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/0d6be220/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


Mime
View raw message