emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore backed up console, continue writing when its unclogged

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2018-08-02 15:28:38 +02:00
parent 678b309f71
commit 9c2d0cb9fc
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
syslogd.c
View File

@ -699,7 +699,7 @@ struct filed {
int f_prevpri; /* pri of f_prevline */ int f_prevpri; /* pri of f_prevline */
int f_prevlen; /* length of f_prevline */ int f_prevlen; /* length of f_prevline */
int f_prevcount; /* repetition cnt of prevline */ int f_prevcount; /* repetition cnt of prevline */
int f_repeatcount; /* number of "repeated" msgs */ size_t f_repeatcount; /* number of "repeated" msgs */
int f_flags; /* store some additional flags */ int f_flags; /* store some additional flags */
}; };
@ -825,7 +825,7 @@ int main(int argc, char **argv);
char **crunch_list(char *list); char **crunch_list(char *list);
int usage(void); int usage(void);
void untty(void); void untty(void);
void printchopped(const char *hname, char *msg, int len, int fd); void printchopped(const char *hname, char *msg, size_t len, int fd);
void printline(const char *hname, char *msg); void printline(const char *hname, char *msg);
void printsys(char *msg); void printsys(char *msg);
void logmsg(int pri, char *msg, const char *from, int flags); void logmsg(int pri, char *msg, const char *from, int flags);
@ -1496,7 +1496,7 @@ void untty()
void printchopped(hname, msg, len, fd) void printchopped(hname, msg, len, fd)
const char *hname; const char *hname;
char *msg; char *msg;
int len; size_t len;
int fd; int fd;
{ {
auto int ptlngth; auto int ptlngth;
@ -2089,6 +2089,13 @@ void fprintlog(f, from, flags, msg)
if (f->f_type == F_FILE && e == ENOSPC) if (f->f_type == F_FILE && e == ENOSPC)
break; break;
/*
* If the console is backed up, just ignore it
* and continue writing again when possible.
*/
if (f->f_type == F_CONSOLE && e == EAGAIN)
break;
(void) close(f->f_file); (void) close(f->f_file);
/* /*
* Check for EBADF on TTY's due to vhangup() XXX * Check for EBADF on TTY's due to vhangup() XXX