From 83cd2a105e44c0033f1ada038c202d7e6e885aaa Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 11 Aug 2006 15:59:06 +0000 Subject: [PATCH] added server-error event so offline process can die gracefully git-svn-id: svn://svn.open-ils.org/ILS/trunk@5468 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/extras/ils_events.xml | 3 +++ Open-ILS/src/offline/offline.pl | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml index ef6e671ed7..91ad2c222f 100644 --- a/Open-ILS/src/extras/ils_events.xml +++ b/Open-ILS/src/extras/ils_events.xml @@ -536,6 +536,9 @@ The attempt to query to the DB failed + + There was an internal server error + Permission Denied diff --git a/Open-ILS/src/offline/offline.pl b/Open-ILS/src/offline/offline.pl index 5fd80874a2..0ab1751503 100755 --- a/Open-ILS/src/offline/offline.pl +++ b/Open-ILS/src/offline/offline.pl @@ -519,11 +519,18 @@ sub ol_process_commands { my $last = ($x++ == scalar(@$commands) - 1) ? 1 : 0; my $res = { command => $d }; - $res->{event} = ol_handle_checkin($d) if $t eq 'checkin'; - $res->{event} = ol_handle_inhouse($d) if $t eq 'in_house_use'; - $res->{event} = ol_handle_checkout($d) if $t eq 'checkout'; - $res->{event} = ol_handle_renew($d) if $t eq 'renew'; - $res->{event} = ol_handle_register($d) if $t eq 'register'; + try { + $res->{event} = ol_handle_checkin($d) if $t eq 'checkin'; + $res->{event} = ol_handle_inhouse($d) if $t eq 'in_house_use'; + $res->{event} = ol_handle_checkout($d) if $t eq 'checkout'; + $res->{event} = ol_handle_renew($d) if $t eq 'renew'; + $res->{event} = ol_handle_register($d) if $t eq 'register'; + + } catch Error with { + my $e = shift; + $res->{event} = OpenILS::Event->new( + 'INTERNAL_SERVER_ERROR', debug => "$e"); + }; ol_append_result($res, $last); -- 2.11.0