Author: mturk
Date: Sat Oct 2 15:51:03 2010
New Revision: 1003821
URL: http://svn.apache.org/viewvc?rev=1003821&view=rev
Log:
Use system default logger in case of invalid LogFile. Traim trailing spaces on
the fly
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=1003821&r1=1003820&r2=1003821&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:51:03 2010
@@ -285,6 +285,8 @@ static BOOL redirectStdStreams(APX_STDWR
*stdout = *lpWrapper->fpStdOutFile;
setvbuf(stdout, NULL, _IONBF, 0);
}
+ else
+ lpWrapper->szStdOutFilename = NULL;
}
if (lpWrapper->szStdErrFilename) {
if (lstrcmpiW(lpWrapper->szStdErrFilename, PRSRV_AUTO) == 0) {
@@ -302,6 +304,8 @@ static BOOL redirectStdStreams(APX_STDWR
*stderr = *lpWrapper->fpStdErrFile;
setvbuf(stderr, NULL, _IONBF, 0);
}
+ else
+ lpWrapper->szStdOutFilename = NULL;
}
else if (lpWrapper->fpStdOutFile) {
_dup2(_fileno(lpWrapper->fpStdOutFile), 2);
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=1003821&r1=1003820&r2=1003821&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:51:03 2010
@@ -152,9 +152,10 @@ HANDLE apxLogOpen(
NULL);
if (h->hFile == INVALID_HANDLE_VALUE) {
/* Make sure we write somewhere */
- h->hFile = GetStdHandle(STD_ERROR_HANDLE);
+ h = &_st_sys_errhandle;
apxDisplayError(FALSE, NULL, 0,
- "Unable to create logger at '%S'\n", sPath);
+ "Unable to create logger at '%S'\n", sPath);
+ return (HANDLE)h;
}
/* Set this file as system log file */
if (!_st_sys_loghandle)
@@ -279,7 +280,7 @@ apxLogWrite(
lstrcpyA(szBp, "Unknown error code");
if (dwLevel == APXLOG_LEVEL_ERROR) {
szBp += 18;
- wsprintfA(szBp, " occured in (%s:%d) ", f, dwLine);
+ wsprintfA(szBp, " occured in (%s:%d) ", f, dwLine);
}
}
else
@@ -327,7 +328,7 @@ apxLogWrite(
WriteFile(lf->hFile, sb, lstrlenA(sb), &wr, NULL);
}
WriteFile(lf->hFile, buffer, len, &wr, NULL);
-
+
/* Terminate the line */
WriteFile(lf->hFile, LINE_SEP, sizeof(LINE_SEP) - 1, &wr, NULL);
#ifdef _DEBUG_FULL
