summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-06-02 15:16:59 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2016-06-02 15:16:59 +0100
commit9befa1ca9a2acc3cb372b53504ace48cc2ac2a2f (patch)
tree0914dc573f69d1cc997a96db1b851ea78527c607
parentecc5f51aca286f528e46dade1cf50776e8e38d02 (diff)
Enhance logging for unfound spoolfile
-rw-r--r--src/src/spool_in.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 8e3099d88..7eb42907c 100644
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -50,7 +50,8 @@ for (i = 0; i < 2; i++)
{
uschar * fname;
int save_errno;
- message_subdir[0] = split_spool_directory == (i == 0) ? id[5] : 0;
+
+ message_subdir[0] = split_spool_directory == i == 0 ? id[5] : 0;
fname = spool_fname(US"input", message_subdir, id, US"-D");
DEBUG(D_deliver) debug_printf("Trying spool file %s\n", fname);
@@ -61,10 +62,13 @@ for (i = 0; i < 2; i++)
{
if (i == 0) continue;
if (!queue_running)
- log_write(0, LOG_MAIN, "Spool file %s-D not found", id);
+ log_write(0, LOG_MAIN, "Spool%s%s file %s-D not found",
+ *queue_name ? " Q=" : "",
+ *queue_name ? queue_name : "",
+ id);
}
- else log_write(0, LOG_MAIN, "Spool error for %s: %s", fname,
- strerror(errno));
+ else
+ log_write(0, LOG_MAIN, "Spool error for %s: %s", fname, strerror(errno));
errno = save_errno;
return -1;
}