X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e42c9458c2f1e3a78d6d45e99741d6edb38fc0cc..1a016bfdec2823c6d4e78a3dcc253cdfc30a10af:/log.c?ds=sidebyside diff --git a/log.c b/log.c index 8be3605a..90b287e1 100644 --- a/log.c +++ b/log.c @@ -24,6 +24,30 @@ #include "rsync.h" +void log_open(void) +{ + static int initialised; + int options = LOG_PID; + + if (initialised) return; + initialised = 1; + +#ifdef LOG_NDELAY + options |= LOG_NDELAY; +#endif + +#ifdef LOG_DAEMON + openlog("rsyncd", options, lp_syslog_facility()); +#else + openlog("rsyncd", options); +#endif + +#ifndef LOG_NDELAY + syslog(LOG_INFO,"rsyncd started\n"); +#endif +} + + /* this is the rsync debugging function. Call it with FINFO or FERROR */ void rprintf(int fd, const char *format, ...) { @@ -44,19 +68,10 @@ void rprintf(int fd, const char *format, ...) buf[len] = 0; if (am_daemon) { - static int initialised; int priority = LOG_INFO; if (fd == FERROR) priority = LOG_WARNING; - if (!initialised) { - initialised = 1; -#ifdef LOG_DAEMON - openlog("rsyncd", LOG_PID, lp_syslog_facility()); -#else - openlog("rsyncd", LOG_PID); -#endif - } - + log_open(); syslog(priority, "%s", buf); return; }