interchange-cvs at icdevgroup
Aug 14, 2009, 4:22 PM
Post #1 of 1
(278 views)
Permalink
|
|
[SCM] Interchange branch, master, updated. 00161cc0d050620431dd26379fb11b37098c59bc
|
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".
The branch, master has been updated
via 00161cc0d050620431dd26379fb11b37098c59bc (commit)
from c22ee2d0b46afa1a91c5e033b2200d895fe79083 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 00161cc0d050620431dd26379fb11b37098c59bc
Author: David Christensen <david [at] endpoint>
Date: Fri Aug 14 17:12:37 2009 -0500
Always log route_order errors regardless of errors_to setting
Slightly reorganizes the error handling path in route_order to always
log the collected errors to ::logError even when errors_to is set. If
errors_to is set and there is an error/failure within send_email, the
errors will essentially be lost since they never made it to their
intended recipients. Changing the behavior to always log this ensures
that the errors will not go unnoticed.
-----------------------------------------------------------------------
Summary of changes and diff:
lib/Vend/Order.pm | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/Vend/Order.pm b/lib/Vend/Order.pm
index 1e9b4b6..1ebf218 100644
--- a/lib/Vend/Order.pm
+++ b/lib/Vend/Order.pm
@@ -1967,18 +1967,16 @@ sub route_order {
$main->{rollback}
);
}
+ $Vend::Session->{order_error} = $errors;
+ ::logError("ERRORS on ORDER %s:\n%s", $::Values->{mv_order_number}, $errors);
+
if ($main->{errors_to}) {
- $Vend::Session->{order_error} = $errors;
send_mail(
$main->{errors_to},
errmsg("ERRORS on ORDER %s", $::Values->{mv_order_number}),
$errors
);
}
- else {
- $Vend::Session->{order_error} = $errors;
- ::logError("ERRORS on ORDER %s:\n%s", $::Values->{mv_order_number}, $errors);
- }
}
# Get rid of this puppy
hooks/post-receive
--
Interchange
_______________________________________________
interchange-cvs mailing list
interchange-cvs [at] icdevgroup
http://www.icdevgroup.org/mailman/listinfo/interchange-cvs
|
