Changeset 20184

Timestamp:

2009-08-07T21:04:08+12:00 (15 years ago)

Author:

ak19

Message:

The program that sends the Stop signal to the apache web server now takes an additional parameter: SILENT. If provided, it will not display a popup if the handle is invalid (if there was no apache web server running).

Location:

gsdl/trunk

Files:

• gsicontrol.bat (modified) (1 diff)
• runtime-src/src/w32apachectl/stophttpd.cpp (modified) (2 diffs)

gsdl/trunk/gsicontrol.bat

@@ -178 +178 @@
     echo Stopping web server (if running)
     if not exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" echo missing conf file
-    if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD
+    if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" GS2_APACHE_HTTPD SILENT
     echo Setting config file to use port %port%
 bin\windows\sed.exe "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg

gsdl/trunk/runtime-src/src/w32apachectl/stophttpd.cpp

@@ -59 +59 @@
                                  LPTSTR pszCmdLine, int nShowCmd) 
 {
-  if(__argc != 2) {
-    MessageBox(NULL, __TEXT("Usage: stophttpd.exe <event-name>"),
+  if(__argc < 2 ||__argc > 3) {
+    MessageBox(NULL, __TEXT("Usage: stophttpd.exe <event-name> [SILENT]"),
            TEXT("Error"), MB_OK);
     return(1);
@@ -71 +71 @@
   // send the termination event
   if (SetEvent(g_heventTerminateProcessGroup)==0) {
-    // do error popup ExitError
-    
-    ErrorExit(TEXT("Failed to send termination event: httpd.exe needs to be terminated manually."));
-    fprintf(stderr, "Failed to send termination event: httpd.exe needs to be terminated manually.\n");
+    // no popup if in SILENT mode (3rd arg == silent or SILENT)
+    if(__argc != 3 || _stricmp(__argv[2], "SILENT\0") != 0) {
+      // do error popup ExitError
+      
+      ErrorExit(TEXT("Failed to send termination event: httpd.exe needs to be terminated manually."));
+      fprintf(stderr, "Failed to send termination event: httpd.exe needs to be terminated manually.\n");
+    }
   }