diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-03-11 13:57:36 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-03-11 13:57:36 +0000 |
| commit | cb7f98ee7f57af247aacb94977c8f744a1d02eca (patch) | |
| tree | 9a777871fa4e4f9928ff960d52ffce2343df29d8 /scheduler/log.c | |
| parent | c5b24bfa983a8b50262d8c3dd037e0181cfaae61 (diff) | |
| download | cups-cb7f98ee7f57af247aacb94977c8f744a1d02eca.tar.gz | |
Sync up with CUPS 1.7svn-r10893
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4216 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/log.c')
| -rw-r--r-- | scheduler/log.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/scheduler/log.c b/scheduler/log.c index a476d2a03..95768e846 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -41,6 +41,22 @@ static int log_linesize = 0; /* Size of line for output file */ static char *log_line = NULL; /* Line for output file */ +#ifdef HAVE_VSYSLOG +static const int syslevels[] = /* SYSLOG levels... */ + { + 0, + LOG_EMERG, + LOG_ALERT, + LOG_CRIT, + LOG_ERR, + LOG_WARNING, + LOG_NOTICE, + LOG_INFO, + LOG_DEBUG, + LOG_DEBUG + }; +#endif /* HAVE_VSYSLOG */ + /* * Local functions... @@ -543,8 +559,12 @@ cupsdLogMessage(int level, /* I - Log level */ if ((TestConfigFile || !ErrorLog) && level <= CUPSD_LOG_WARN) { va_start(ap, message); +#ifdef HAVE_VSYSLOG + vsyslog(LOG_LPR | syslevels[level], message, ap); +#else vfprintf(stderr, message, ap); putc('\n', stderr); +#endif /* HAVE_VSYSLOG */ va_end(ap); return (1); @@ -984,21 +1004,6 @@ cupsdWriteErrorLog(int level, /* I - Log level */ 'D', 'd' }; -#ifdef HAVE_VSYSLOG - static const int syslevels[] = /* SYSLOG levels... */ - { - 0, - LOG_EMERG, - LOG_ALERT, - LOG_CRIT, - LOG_ERR, - LOG_WARNING, - LOG_NOTICE, - LOG_INFO, - LOG_DEBUG, - LOG_DEBUG - }; -#endif /* HAVE_VSYSLOG */ #ifdef HAVE_VSYSLOG |