You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ac...@apache.org on 2017/06/15 08:50:23 UTC
karaf git commit: [KARAF-5206] modified karaf and karaf.bat scripts
to check pid and process name upon cheking for already running instances
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x de932d334 -> be9e2719e
[KARAF-5206] modified karaf and karaf.bat scripts to check pid and process name upon cheking for already running instances
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/be9e2719
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/be9e2719
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/be9e2719
Branch: refs/heads/karaf-4.1.x
Commit: be9e2719ed0be8c30faf01237b29c83d4ea40bcd
Parents: de932d3
Author: Andrea Tarocchi <at...@redhat.com>
Authored: Thu Jun 15 10:12:01 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jun 15 10:49:24 2017 +0200
----------------------------------------------------------------------
.../base/src/main/filtered-resources/resources/bin/karaf | 6 +++++-
.../base/src/main/filtered-resources/resources/bin/karaf.bat | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/be9e2719/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
old mode 100755
new mode 100644
index 5b06aa9..a2fd5cb
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -91,7 +91,11 @@ checkRootInstance() {
if [ "${ROOT_INSTANCE_PID}" -ne "0" ]; then
if ps p "${ROOT_INSTANCE_PID}" > /dev/null
then
- ROOT_INSTANCE_RUNNING=true
+ MAIN=org.apache.karaf.main.Main
+ PID_COMMAND=$(ps p "${ROOT_INSTANCE_PID}" o args | sed 1d)
+ if [ "${PID_COMMAND#*$MAIN}" != "$PID_COMMAND" ]; then
+ ROOT_INSTANCE_RUNNING=true
+ fi
fi
fi
fi
http://git-wip-us.apache.org/repos/asf/karaf/blob/be9e2719/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index b3e8a89..2a79776 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -224,8 +224,8 @@ if not "%JAVA%" == "" goto :Check_JAVA_END
if "%ROOT_INSTANCE_PID%" == "~13" SET CHECK_RUNNING_CONDITION=false
if "%ROOT_INSTANCE_PID%" == "0" SET CHECK_RUNNING_CONDITION=false
if "%CHECK_RUNNING_CONDITION%" == "true" (
- tasklist /fi "PID eq %ROOT_INSTANCE_PID%" | find ":" > NUL
- if errorlevel 1 set ROOT_INSTANCE_RUNNING=true
+ tasklist /FI "PID eq %ROOT_INSTANCE_PID%" 2>NUL | find /I /N "java.exe" > NUL
+ if not errorlevel 1 set ROOT_INSTANCE_RUNNING=true
)