pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-07-29 22:42:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Print out a warning when we can't write to a log file. When booting this

Browse source 
goes to the boot screen. When we are already booted it's sent to all
  IRCOps with a limit of max. 1 message per 5 minutes.
- Refuse to boot when we can't write to any log file.
This commit is contained in:
Bram Matthys 2012-04-05 21:47:15 +02:00
parent 374b79c084
commit 3d728f5f2e
2 changed files with 60 additions and 7 deletions

4
Changes
View file

@ -2416,3 +2416,7 @@
- Fix win32 installer: apparently it sometimes complained about not having the
Visual C++ 2008 redistributable package installed when this was not true.
- Win32 compile fix
- Print out a warning when we can't write to a log file. When booting this
goes to the boot screen. When we are already booted it's sent to all
IRCOps with a limit of max. 1 message per 5 minutes.
- Refuse to boot when we can't write to any log file.

63
src/s_extra.c
View file

@ -277,11 +277,14 @@ int channel_canjoin(aClient *sptr, char *name)
/* irc logs.. */
void ircd_log(int flags, char *format, ...)
{
static int last_log_file_warning = 0;
va_list ap;
ConfigItem_log *logs;
char buf[2048], timebuf[128];
int fd;
struct stat fstats;
int written = 0, write_failure = 0;
va_start(ap, format);
ircvsprintf(buf, format, ap);
@ -294,11 +297,14 @@ void ircd_log(int flags, char *format, ...)
#ifdef HAVE_SYSLOG
if (!stricmp(logs->file, "syslog") && logs->flags & flags) {
syslog(LOG_INFO, "%s", buf);
written++;
continue;
}
#endif
if (logs->flags & flags) {
if (stat(logs->file, &fstats) != -1 && logs->maxsize && fstats.st_size >= logs->maxsize) {
if (logs->flags & flags)
{
if (stat(logs->file, &fstats) != -1 && logs->maxsize && fstats.st_size >= logs->maxsize)
{
#ifndef _WIN32
fd = open(logs->file, O_CREAT|O_WRONLY|O_TRUNC, S_IRUSR|S_IWUSR);
#else
@ -310,16 +316,59 @@ void ircd_log(int flags, char *format, ...)
}
else {
#ifndef _WIN32
fd = open(logs->file, O_CREAT|O_APPEND|O_WRONLY, S_IRUSR|S_IWUSR);
fd = open(logs->file, O_CREAT|O_APPEND|O_WRONLY, S_IRUSR|S_IWUSR);
#else
fd = open(logs->file, O_CREAT|O_APPEND|O_WRONLY, S_IREAD|S_IWRITE);
fd = open(logs->file, O_CREAT|O_APPEND|O_WRONLY, S_IREAD|S_IWRITE);
#endif
if (fd == -1)
continue;
if (fd == -1)
{
if (!loop.ircd_booted)
{
config_status("WARNING: Unable to write to '%s': %s", logs->file, strerror(ERRNO));
} else {
if (last_log_file_warning + 300 < TStime())
{
config_status("WARNING: Unable to write to '%s': %s. This warning will not re-appear for at least 5 minutes.", logs->file, strerror(ERRNO));
last_log_file_warning = TStime();
}
}
write_failure = 1;
continue;
}
}
write(fd, timebuf, strlen(timebuf));
write(fd, buf, strlen(buf));
if (write(fd, buf, strlen(buf)) == strlen(buf))
{
written++;
}
else
{
if (!loop.ircd_booted)
{
config_status("WARNING: Unable to write to '%s': %s", logs->file, strerror(ERRNO));
} else {
if (last_log_file_warning + 300 < TStime())
{
config_status("WARNING: Unable to write to '%s': %s. This warning will not re-appear for at least 5 minutes.", logs->file, strerror(ERRNO));
last_log_file_warning = TStime();
}
}
write_failure = 1;
}
close(fd);
}
}
/* If nothing got written at all AND we had a write failure AND we are booting, then exit.
* Note that we can't just fail when nothing got written, as we might have been called for
* 'tkl' for example, which might not be in our log block.
*/
if (!written && write_failure && !loop.ircd_booted)
{
config_status("ERROR: Unable to write to any log file. Please check your log { } blocks and file permissions!");
#ifdef _WIN32
win_error();
#endif
exit(9);
}
}