svn commit: r1003811 - in /commons/proper/daemon/trunk/src/native/windows: apps/prunsrv/prunsrv.c src/log.c

[mturk]

Author: mturk
Date: Sat Oct  2 15:18:49 2010
New Revision: 1003811

URL: http://svn.apache.org/viewvc?rev=1003811&view=rev
Log:
Make sure we log somewhere in case LogPath is invalid

Modified:
    commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c
    commons/proper/daemon/trunk/src/native/windows/src/log.c

Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c?rev=1003811&r1=1003810&r2=1003811&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c 
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.c Sat 
Oct  2 15:18:49 2010
@@ -1381,7 +1381,7 @@ cleanup:
 /* Run the service in the debug mode */
 BOOL docmdDebugService(LPAPXCMDLINE lpCmdline)
 {
-    BOOL rv = FALSE;
+    BOOL rv = TRUE;
 
     _service_mode = FALSE;
     _service_name = lpCmdline->szApplication;

Modified: commons/proper/daemon/trunk/src/native/windows/src/log.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/log.c?rev=1003811&r1=1003810&r2=1003811&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/log.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/log.c Sat Oct  2 
15:18:49 2010
@@ -134,7 +134,7 @@ HANDLE apxLogOpen(
               sysTime.wMonth,
               sysTime.wDay);
     if (!(h = (apx_logfile_st *)apxPoolCalloc(hPool, sizeof(apx_logfile_st))))
-        return NULL;
+        return INVALID_HANDLE_VALUE;
     /* Set default level to info */
     h->dwLogLevel = APXLOG_LEVEL_INFO;
     CreateDirectoryW(sPath, NULL);
@@ -150,6 +150,10 @@ HANDLE apxLogOpen(
                       OPEN_ALWAYS,
                       FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH | 
FILE_FLAG_SEQUENTIAL_SCAN,
                       NULL);
+    if (h->hFile == INVALID_HANDLE_VALUE) {
+        /* Make sure we write somewhere */
+        h->hFile = GetStdHandle(STD_ERROR_HANDLE);
+    }
     /* Set this file as system log file */
     if (!_st_sys_loghandle)
         _st_sys_loghandle = h;