X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=028f43532c7cb8778ad80ca3c3a58d795d533452;hb=8f5cbe51a79c786be30ebc93466988cf67a825e1;hp=d81bec2496a8c966b1771926564f26bcf404a2a8;hpb=3641e511095203818df7ca05439cf42eb7c7c954;p=ngircd-alex.git diff --git a/src/ngircd/log.c b/src/ngircd/log.c index d81bec24..028f4353 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -79,10 +79,12 @@ Log_Init(bool Daemon_Mode) #ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */ #define LOG_CONS 0 #endif - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); +#ifdef LOG_DAEMON + openlog(PACKAGE, LOG_CONS|LOG_PID, LOG_DAEMON); +#else + openlog(PACKAGE, LOG_CONS|LOG_PID, 0); +#endif #endif - - Log(LOG_NOTICE, "%s started.", NGIRCd_Version); } /* Log_Init */ @@ -97,17 +99,19 @@ Log_ReInit(void) #define LOG_CONS 0 #endif closelog(); - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); + openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif Log(LOG_NOTICE, "%s started.", NGIRCd_Version); + Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile); } GLOBAL void Log_Exit( void ) { - Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME, - NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted()); + Log(LOG_INFO, "%s done%s, served %lu connection%s.", PACKAGE_NAME, + NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(), + Conn_CountAccepted() == 1 ? "" : "s"); #ifdef SYSLOG closelog(); #endif @@ -156,7 +160,7 @@ va_dcl * suitable for the mode ngIRCd is running in (daemon vs. non-daemon). * If LOG_snotice is set, the log messages goes to all user with the mode +s * set and the local &SERVER channel, too. - * Please note: you sould use LogDebug(...) for debug messages! + * Please note: you should use LogDebug(...) for debug messages! * @param Level syslog level (LOG_xxx) * @param Format Format string like printf(). * @param ... Further arguments. @@ -215,7 +219,7 @@ GLOBAL void Log_Init_Subprocess(char UNUSED *Name) { #ifdef SYSLOG - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); + openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif #ifdef DEBUG Log_Subprocess(LOG_DEBUG, "%s sub-process starting, PID %ld.",