From b08d9fbc722cb7ed5001056842511e8cfb6db546 Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Wed, 25 Nov 2009 09:55:53 +0000
Subject: [PATCH] Instrument a bit more logging in DELIVER

---
 src/agents/store/command.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/agents/store/command.c b/src/agents/store/command.c
index 2620481..1e45a4c 100644
--- a/src/agents/store/command.c
+++ b/src/agents/store/command.c
@@ -1851,7 +1851,7 @@ StoreCommandDELIVER(StoreClient *client, char *sender, char *authSender,
     tmpFile[0] = 0;
 
     if (!filename) {
-	const char *work_dir = (char *)MsgGetDir(MSGAPI_DIR_WORK, NULL, 0);
+        const char *work_dir = (char *)MsgGetDir(MSGAPI_DIR_WORK, NULL, 0);
 
         if (bytes <= 0) {
             return ConnWriteStr(client->conn, MSG3017INTARGRANGE);
@@ -1860,6 +1860,7 @@ StoreCommandDELIVER(StoreClient *client, char *sender, char *authSender,
         if (!msgfile) {
             return ConnWriteStr(client->conn, MSG5202TMPWRITEERR);
         }
+        Ringlog("deliver: Reading stream content to file");
         ccode = ConnReadToFile(client->conn, msgfile, bytes);
         if (-1 == ccode) {
             unlink(tmpFile);
@@ -1898,6 +1899,7 @@ StoreCommandDELIVER(StoreClient *client, char *sender, char *authSender,
         int n;
         int status;
         char buffer[CONN_BUFSIZE];
+        char rlstring[256];
 
         ccode = ConnReadAnswer(client->conn, buffer, sizeof(buffer));
         if (-1 == ccode) {
@@ -1909,6 +1911,8 @@ StoreCommandDELIVER(StoreClient *client, char *sender, char *authSender,
         }
 
         /* <recipient> <mailbox> <flags> */
+        snprintf(rlstring, 255, "deliver: %s", buffer);
+        Ringlog(rlstring);
 
         n = BongoStringSplit(buffer, ' ', args, 3);
         if (TOKEN_OK != (ccode = CheckTokC(client, n, 3, 3)) ||
@@ -1927,6 +1931,8 @@ StoreCommandDELIVER(StoreClient *client, char *sender, char *authSender,
             ccode = ConnWriteStr(client->conn, MSG5201FILEREADERR);
             goto cleanup;
         }
+        snprintf(rlstring, 255, "deliver: selecting store %s", recipient);
+        Ringlog(rlstring);
         SelectStore(client, recipient);
         
         if (! client->readonly) {
@@ -1936,6 +1942,8 @@ StoreCommandDELIVER(StoreClient *client, char *sender, char *authSender,
             status = DELIVER_FAILURE;
         }
         UnselectStore(client);
+        Ringlog("deliver: store unselected");
+        
         switch (status) {
         case DELIVER_SUCCESS:
             ccode = ConnWriteStr(client->conn, MSG1000DELIVERYOK);