Move wmic pid-finding code into its own batch file

2 files changed, 41 insertions, 41 deletions

diff --git a/scripts/rabbitmq-echopid.bat b/scripts/rabbitmq-echopid.bat
new file mode 100644
index 0000000000..2efbab7ada
--- /dev/null
+++ b/scripts/rabbitmq-echopid.bat
@@ -0,0 +1,40 @@
+@echo off
+
+setlocal
+
+:: get the name of the node ::
+set NODENAME="%RABBITMQ_NODENAME%"
+if "%NODENAME%"=="" (
+    set NODENAME=rabbit@%COMPUTERNAME%
+)
+
+:: check that wmic exists ::
+set WMIC_PATH=%SYSTEMROOT%\System32\Wbem\wmic.exe
+if not exist "%WMIC_PATH%" (
+  REM  echo "%WMIC_PATH%" not found.
+  goto :wmic_end
+)
+
+:: build node name expression ::
+set RABBITMQ_NODENAME_CLI=-sname %RABBITMQ_NODENAME%
+
+FOR /F "usebackq tokens=* skip=1" %%P IN (`%%WMIC_PATH%% process where "name='erl.exe' and commandline like '%%%RABBITMQ_NODENAME_CLI%%%'" get processid 2^>nul`) do (
+  SET PID=%%P
+  goto :wmic_echopid
+)
+
+:wmic_echopid
+
+:: check for pid not found ::
+if "%PID%" == "" (
+  REM echo Could not find erl.exe pid
+  goto :wmic_end
+)
+
+:: show pid ::
+echo %PID%
+
+:: all done ::
+:wmic_end
+
+endlocal
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 563403b3f9..c27b418adb 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -123,7 +123,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
    )

 )

 

-start "!RABBITMQ_NODENAME!" "!ERLANG_HOME!\bin\erl.exe" ^

+"!ERLANG_HOME!\bin\erl.exe" ^

 !RABBITMQ_EBIN_PATH! ^

 -noinput ^

 -boot "!RABBITMQ_BOOT_FILE!" ^

@@ -146,45 +146,5 @@ start "!RABBITMQ_NODENAME!" "!ERLANG_HOME!\bin\erl.exe" ^
 !RABBITMQ_SERVER_START_ARGS! ^

 !STAR!

 

-:: pid file ::

-set PID_FILE=%RABBITMQ_BASE%\pid.txt

-echo pidfile is "%PID_FILE%"

-

-if exist "%PID_FILE%" (

-   del /f "%PID_FILE%"

-)

-

-:: check that wmic exists ::

-set WMIC_PATH=%SYSTEMROOT%\System32\Wbem\wmic.exe

-if not exist "%WMIC_PATH%" (

-  echo "%WMIC_PATH%" not found.

-  goto :wmic_end

-)

-

-:: declare node name ::

-set RABBITMQ_NODENAME_CLI=-sname %RABBITMQ_NODENAME%

-

-FOR /F "usebackq tokens=* skip=1" %%P IN (`%%WMIC_PATH%% process where "name='erl.exe' and commandline like '%%%RABBITMQ_NODENAME_CLI%%%'" get processid`) do (

-  SET PID=%%P

-  goto :wmic_writepid

-)

-

-:wmic_writepid

-

-:: check for pid not found ::

-if "%PID%" == "" (

-  echo Could not find erl.exe pid

-  goto :wmic_end

-)

-

-:: show ::

-echo erl.exe pid is %PID%

-

-:: write to file ::

-echo %PID% > "%PID_FILE%"

-

-:: all done ::

-:wmic_end

-

 endlocal

 endlocal