git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deal with maildir quota file races.
[users/jgh/exim.git]
/
src
/
exim_monitor
/
em_log.c
diff --git
a/src/exim_monitor/em_log.c
b/src/exim_monitor/em_log.c
index 5f0f9b29d9a3c70d83f4e3d34d3e680f7486d514..8cad78245a7b4d1ba05554bad759249b92465f1a 100644
(file)
--- a/
src/exim_monitor/em_log.c
+++ b/
src/exim_monitor/em_log.c
@@
-1,13
+1,13
@@
-/* $Cambridge: exim/src/exim_monitor/em_log.c,v 1.
1 2004/10/07 10:39:01 ph10
Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_log.c,v 1.
6 2009/11/16 19:50:36 nm4
Exp $ */
/*************************************************
* Exim Monitor *
*************************************************/
/*************************************************
* Exim Monitor *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
4
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
-/* This module contains code for scanning the
smaill
log,
+/* This module contains code for scanning the
main
log,
extracting information from it, and displaying a "tail". */
#include "em_hdr.h"
extracting information from it, and displaying a "tail". */
#include "em_hdr.h"
@@
-250,14
+250,20
@@
if (LOG != NULL)
}
/* Munge the log entry and display shortened form on one line.
}
/* Munge the log entry and display shortened form on one line.
- We omit the date and show only the time. Remove any time zone offset. */
+ We omit the date and show only the time. Remove any time zone offset.
+ Take note of the presence of [pid]. */
if (pcre_exec(yyyymmdd_regex,NULL,CS buffer,length,0,PCRE_EOPT,NULL,0) >= 0)
{
if (pcre_exec(yyyymmdd_regex,NULL,CS buffer,length,0,PCRE_EOPT,NULL,0) >= 0)
{
+ int pidlength = 0;
if ((buffer[20] == '+' || buffer[20] == '-') &&
isdigit(buffer[21]) && buffer[25] == ' ')
memmove(buffer + 20, buffer + 26, Ustrlen(buffer + 26) + 1);
if ((buffer[20] == '+' || buffer[20] == '-') &&
isdigit(buffer[21]) && buffer[25] == ' ')
memmove(buffer + 20, buffer + 26, Ustrlen(buffer + 26) + 1);
- id = string_copyn(buffer + 20, MESSAGE_ID_LENGTH);
+ if (buffer[20] == '[')
+ {
+ while (Ustrchr("[]0123456789", buffer[20+pidlength++]) != NULL);
+ }
+ id = string_copyn(buffer + 20 + pidlength, MESSAGE_ID_LENGTH);
show_log("%s", buffer+11);
}
else
show_log("%s", buffer+11);
}
else