Changeset 20639 for gsdl

Timestamp:

2009-09-18T20:23:46+12:00 (15 years ago)

Author:

ak19

Message:

Now, on web-start and web-stop, the gsicontrol.bat script no longer automatically returns MONITOR_SUCCESS. If the errorlevel value returned from the stophttpd and starthttpd executables are negative, MONITOR_FAILED is returned. Only if errorlevel is 0 or higher, is MONITOR_SUCCESS returned. Modified the starthttpd (and starthttpdchild) and stophttpd cpp files to return a -1 when the number of arguments are wrong.

File:

• gsdl/trunk/gsicontrol.bat (modified) (2 diffs)

gsdl/trunk/gsicontrol.bat

@@ -91 +91 @@
 :: then we start up apache-httpd and pass the signal that the stop command will respond to
 START "%GSDLHOME%\apachectl" "%GSDLHOME%\bin\windows\starthttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% "%GSDLHOME%\apache-httpd\windows\bin\httpd.exe"
-echo %MONITOR_SUCCESS%
+:: if the return value is >= 0, it's succeeded:
+if ERRORLEVEL 0 (echo %MONITOR_SUCCESS%) else (echo %MONITOR_FAILED%)
 echo %MONITOR_FINISHED%
 goto exit
@@ -99 +100 @@
 if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% SILENT
 if "%target%" == "web-stop-tested" goto exit
-echo %MONITOR_SUCCESS%
+:: if the return value is >= 0, it's succeeded:
+if ERRORLEVEL 0 (echo %MONITOR_SUCCESS%) else (echo %MONITOR_FAILED%)
 echo %MONITOR_FINISHED%
 goto exit