mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Use windows event log only if GSLogSyslog is YES
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21790 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS
parent
1ceb50725f
commit
8fcfa3b241
3 changed files with 65 additions and 53 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2005-10-09 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSLog.m: We had complaints about the new code to log output
|
||||
to the windows event log on microsoft ... so this has been changed to
|
||||
be activated by the GSLogSyslog user default (as the windows event
|
||||
log is roughly analogous to syslog on unix) rather than being done
|
||||
by default.
|
||||
|
||||
2005-10-07 Chris Vetter <cbv@gmx.net>
|
||||
|
||||
* Source/NSPropertyList.m: Remove bogus newline generated for BOOL.
|
||||
|
|
|
|||
|
|
@ -149,7 +149,10 @@ notice and this notice are preserved.
|
|||
the syslog facility (on systems which support it), rather
|
||||
than to the standard error stream. This is useful in
|
||||
environments where stderr has been re-used strangely for
|
||||
some reason.
|
||||
some reason.<br />
|
||||
On mswindows, where syslog does not exist, this flag instead
|
||||
controls whether log/debug output is sent to the windows
|
||||
event log.
|
||||
</p>
|
||||
</desc>
|
||||
<term>GSLogThread</term>
|
||||
|
|
|
|||
105
Source/NSLog.m
105
Source/NSLog.m
|
|
@ -41,6 +41,25 @@
|
|||
#include <syslog.h>
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_SYSLOG)
|
||||
# if defined(LOG_ERR)
|
||||
# if defined(LOG_USER)
|
||||
# define SYSLOGMASK (LOG_ERR|LOG_USER)
|
||||
# else
|
||||
# define SYSLOGMASK (LOG_ERR)
|
||||
# endif // LOG_USER
|
||||
# elif defined(LOG_ERROR)
|
||||
# if defined(LOG_USER)
|
||||
# define SYSLOGMASK (LOG_ERROR|LOG_USER)
|
||||
# else
|
||||
# define SYSLOGMASK (LOG_ERROR)
|
||||
# endif // LOG_USER
|
||||
# else
|
||||
# error "Help, I can't find a logging level for syslog"
|
||||
# endif
|
||||
#endif // HAVE_SYSLOG
|
||||
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
@ -110,68 +129,47 @@ _NSLog_standard_printf_handler (NSString* message)
|
|||
len = [d length];
|
||||
}
|
||||
|
||||
#ifdef HAVE_SYSLOG
|
||||
|
||||
#if defined(HAVE_SYSLOG) || defined(WIN32)
|
||||
if (GSUserDefaultsFlag(GSLogSyslog) == YES
|
||||
|| write(_NSLogDescriptor, buf, len) != (int)len)
|
||||
{
|
||||
int mask;
|
||||
/* We NULL-terminate the string in order to feed it to
|
||||
* syslog. */
|
||||
char *null_terminated_buf = objc_malloc (sizeof (char) * (len + 1));
|
||||
|
||||
strncpy (null_terminated_buf, buf, len);
|
||||
null_terminated_buf[len] = '\0';
|
||||
|
||||
#ifdef LOG_ERR
|
||||
mask = LOG_ERR;
|
||||
#else
|
||||
# ifdef LOG_ERROR
|
||||
mask = LOG_ERROR;
|
||||
# else
|
||||
# error "Help, I can't find a logging level for syslog"
|
||||
# endif
|
||||
#endif
|
||||
#if defined(WIN32)
|
||||
OutputDebugString(null_terminated_buf);
|
||||
if (!IsDebuggerPresent())
|
||||
{
|
||||
static HANDLE eventloghandle = 0;
|
||||
|
||||
if (!eventloghandle)
|
||||
{
|
||||
eventloghandle = RegisterEventSource(NULL,
|
||||
[[[NSProcessInfo processInfo] processName] cString]);
|
||||
}
|
||||
if (eventloghandle)
|
||||
{
|
||||
ReportEvent(eventloghandle, // event log handle
|
||||
EVENTLOG_WARNING_TYPE, // event type
|
||||
0, // category zero
|
||||
0, // event identifier
|
||||
NULL, // no user security identifier
|
||||
1, // one substitution string
|
||||
0, // no data
|
||||
&null_terminated_buf, // pointer to string array
|
||||
NULL); // pointer to data
|
||||
}
|
||||
}
|
||||
#else
|
||||
syslog(SYSLOGMASK, "%s", null_terminated_buf);
|
||||
#endif // WIN32
|
||||
|
||||
#ifdef LOG_USER
|
||||
mask |= LOG_USER;
|
||||
#endif
|
||||
syslog(mask, "%s", null_terminated_buf);
|
||||
objc_free (null_terminated_buf);
|
||||
}
|
||||
#else
|
||||
write(_NSLogDescriptor, buf, len);
|
||||
#ifdef WIN32
|
||||
{
|
||||
char *null_terminated_buf = objc_malloc (sizeof (char) * (len + 1));
|
||||
|
||||
strncpy (null_terminated_buf, buf, len);
|
||||
null_terminated_buf[len] = '\0';
|
||||
OutputDebugString(null_terminated_buf);
|
||||
if (!IsDebuggerPresent())
|
||||
{
|
||||
static HANDLE eventloghandle = 0;
|
||||
|
||||
if (!eventloghandle)
|
||||
{
|
||||
eventloghandle = RegisterEventSource(NULL,
|
||||
[[[NSProcessInfo processInfo] processName] cString]);
|
||||
}
|
||||
if (eventloghandle)
|
||||
{
|
||||
ReportEvent(eventloghandle, // event log handle
|
||||
EVENTLOG_WARNING_TYPE, // event type
|
||||
0, // category zero
|
||||
0, // event identifier
|
||||
NULL, // no user security identifier
|
||||
1, // one substitution string
|
||||
0, // no data
|
||||
&null_terminated_buf, // pointer to string array
|
||||
NULL); // pointer to data
|
||||
}
|
||||
}
|
||||
objc_free (null_terminated_buf);
|
||||
}
|
||||
#endif // WIN32
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -199,7 +197,10 @@ _NSLog_standard_printf_handler (NSString* message)
|
|||
* <item>
|
||||
* If the system supports writing to syslog and the user default to
|
||||
* say that logging should be done to syslog (GSLogSyslog) is set,
|
||||
* writes the data to the syslog.
|
||||
* writes the data to the syslog.<br />
|
||||
* On an mswindows system, where syslog is not available, the
|
||||
* GSLogSyslog user default controls whether or not data is written
|
||||
* to the system event log,
|
||||
* </item>
|
||||
* <item>
|
||||
* Otherwise, writes the data to the file descriptor stored in the
|
||||
|
|
@ -248,7 +249,7 @@ NSLog (NSString* format, ...)
|
|||
* <p>
|
||||
* In GNUstep, the GSLogThread user default may be set to YES in
|
||||
* order to instruct this function to include the internal ID of
|
||||
* the mcurrent thread after the process ID. This can help you
|
||||
* the current thread after the process ID. This can help you
|
||||
* to track the behavior of a multi-threaded program.
|
||||
* </p>
|
||||
* <p>
|
||||
|
|
|
|||
Loading…
Reference in a new issue