--- lmtp2nntp_main.c 2003/02/11 14:18:47 1.72
+++ lmtp2nntp_main.c 2003/02/11 15:31:18 1.73
@@ -861,7 +861,7 @@
do {
logbook(ctx->l2, L2_LEVEL_DEBUG, "trying ns[%d]", i);
bOk = TRUE;
- logbook(ctx->l2, L2_LEVEL_TRACE, "try ${option.destination[%d]}", i);
+ logbook(ctx->l2, L2_LEVEL_TRACE, "try destination#%d ${option.destination[%d]}", i, i);
ctx->pns[i].l2 = ctx->l2;
@@ -882,7 +882,7 @@
logbook(ctx->l2, L2_LEVEL_DEBUG, "connect");
if (sa_connect(ctx->pns[i].sa, ctx->pns[i].saa) != SA_OK) {
bOk = FALSE;
- logbook(ctx->l2, L2_LEVEL_WARNING, "connect to ${option.destination[%d]} failed, %m", i);
+ logbook(ctx->l2, L2_LEVEL_WARNING, "connect to destination#%d ${option.destination[%d]} failed, %m", i, i);
}
}
@@ -906,11 +906,11 @@
}
if (bOk) {
- logbook(ctx->l2, L2_LEVEL_INFO, "NNTP session to ${option.destination[%d]} successfully established", i);
+ logbook(ctx->l2, L2_LEVEL_INFO, "NNTP session to destination#%d ${option.destination[%d]} successfully established", i, i);
is++;
}
else {
- logbook(ctx->l2, L2_LEVEL_WARNING, "NNTP session establishment to ${option.destination[%d]} failed", i);
+ logbook(ctx->l2, L2_LEVEL_WARNING, "NNTP session establishment to destination#%d ${option.destination[%d]} failed", i, i);
lmtp_gfs_ns(&ctx->pns[i]);
}
i++;
@@ -1678,14 +1678,14 @@
char *res_ptr;
size_t res_len;
str_format(errorstring, sizeof(errorstring),
- "${option.destination[%d]} returned %s\n"
- "${option.destination[%d]} lastresp \"%s\"",
- i, nntp_error(ctx->pns[i].rc),
- i, nntp_lastresp(ctx->pns[i].nntp));
+ "destination#%d ${option.destination[%d]} returned %s\n"
+ "destination#%d ${option.destination[%d]} lastresp \"%s\"",
+ i, i, nntp_error(ctx->pns[i].rc),
+ i, i, nntp_lastresp(ctx->pns[i].nntp));
if ((var_rc = var_expand(ctx->config_varctx, errorstring, strlen(errorstring), &res_ptr, &res_len, FALSE)) != VAR_OK) {
str_format(errorstring, sizeof(errorstring),
- "destination[%d] returned %s\n"
- "destination[%d] lastresp \"%s\"",
+ "destination#%d returned %s\n"
+ "destination#%d lastresp \"%s\"",
i, nntp_error(ctx->pns[i].rc),
i, nntp_lastresp(ctx->pns[i].nntp));
}
|
