use CLIENT instead of CONNECT

[pmg-log-tracker.git] / pmg-log-tracker.c

diff --git a/pmg-log-tracker.c b/pmg-log-tracker.c
index f916e89988289da108a41e8842fa8c899aab3ddc..9a6a881f473b963e0e0a94653fc1c3271b476fa3 100644 (file)
--- a/pmg-log-tracker.c
+++ b/pmg-log-tracker.c
@@ -780,11 +780,11 @@ sentry_print (LParser *parser, SEntry *sentry)
 
   if (parser->verbose) {
 
-    printf ("SMTPD:\n");
+    printf ("SMTPD: T%08lXL%08lX\n", sentry->ltime, sentry->rel_line_nr);
 
     printf ("CTIME: %08lX\n", parser->ctime);
 
-    if (sentry->connect) { printf ("CONNECT: %s\n", sentry->connect); }
+    if (sentry->connect) { printf ("CLIENT: %s\n", sentry->connect); }
     //printf ("EXTERNAL: %d\n", sentry->external);
 
   }
@@ -800,12 +800,15 @@ sentry_print (LParser *parser, SEntry *sentry)
     nq = nq->next;
   }
 
+  if (!parser->verbose)  { fflush (stdout); return; }
+
   if (parser->verbose > 1) {
     printf ("LOGS:\n");
     loglist_print (&sentry->loglist);
-    printf ("\n");
   }
 
+  printf ("\n");
+
   fflush (stdout);
 }
 
@@ -1088,7 +1091,11 @@ qentry_print (LParser *parser, QEntry *qentry)
     printf ("CTIME: %08lX\n", parser->ctime);
     printf ("SIZE: %u\n", qentry->size);
 
-    if (qentry->client) { printf ("CLIENT: %s\n", qentry->client); }
+    if (qentry->client) {
+      printf ("CLIENT: %s\n", qentry->client);
+    } else if (se && se->connect) {
+      printf ("CLIENT: %s\n", se->connect);
+    }
 
     if (qentry->msgid) { printf ("MSGID: %s\n", qentry->msgid); }
 
@@ -1699,9 +1706,12 @@ print_usage (const char *name)
   fprintf (stderr, "\t-e END         end time (YYYY-MM-DD HH:MM:SS)\n");
   fprintf (stderr, "\t               or seconds since epoch\n");
   fprintf (stderr, "\t-m MSGID       message ID (exact match)\n");
-  fprintf (stderr, "\t-q QID         queue ID (exact match)\n");
+  fprintf (stderr, "\t-q QID         queue ID (exact match), can be\n");
+  fprintf (stderr, "\t               specified multiple times.\n");
   fprintf (stderr, "\t-x STRING      search for strings\n");
   fprintf (stderr, "\t-l LIMIT       print max limit entries\n");
+  fprintf (stderr, "\t-g             exclude greylist entries\n");
+  fprintf (stderr, "\t-n             exclude NDR entries\n");
   fprintf (stderr, "\t-v             verbose output (no logs)\n");
   fprintf (stderr, "\t-vv            verbose output with logs\n");
 }