From 083fbc71caac32f81dad4b25bb277ae4c6603926 Mon Sep 17 00:00:00 2001 From: Andreas Granig Date: Thu, 8 Aug 2013 14:25:53 +0200 Subject: [PATCH] Catch all exceptions and log errors as error. --- lib/NGCP/Panel/Controller/Contract.pm | 4 ++-- lib/NGCP/Panel/Controller/NCOS.pm | 6 ++--- lib/NGCP/Panel/Controller/Peering.pm | 31 ++++++++++++------------- lib/NGCP/Panel/Controller/Rewrite.pm | 4 ++-- lib/NGCP/Panel/Controller/Root.pm | 4 ++-- lib/NGCP/Panel/Controller/Subscriber.pm | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/lib/NGCP/Panel/Controller/Contract.pm b/lib/NGCP/Panel/Controller/Contract.pm index 585ded8d75..246ce84224 100644 --- a/lib/NGCP/Panel/Controller/Contract.pm +++ b/lib/NGCP/Panel/Controller/Contract.pm @@ -247,8 +247,8 @@ sub terminate :Chained('base') :PathPart('terminate') :Args(0) { ); } $c->flash(messages => [{type => 'success', text => 'Contract successfully terminated'}]); - } catch (DBIx::Class::Exception $e) { - $c->log->info("failed to terminate contract: $e"); + } catch ($e) { + $c->log->error("failed to terminate contract: $e"); $c->flash(messages => [{type => 'error', text => 'Failed to terminate contract'}]); }; NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/contract')); diff --git a/lib/NGCP/Panel/Controller/NCOS.pm b/lib/NGCP/Panel/Controller/NCOS.pm index 5f536230a0..00a11a003d 100644 --- a/lib/NGCP/Panel/Controller/NCOS.pm +++ b/lib/NGCP/Panel/Controller/NCOS.pm @@ -132,11 +132,11 @@ sub delete :Chained('base') :PathPart('delete') { try { $c->stash->{level_result}->delete; $c->flash(messages => [{type => 'success', text => 'NCOS level successfully deleted'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->flash(messages => [{type => 'error', text => 'Failed to delete NCOS level'}]); $c->log->error("failed to delete ncos level: $e"); }; - $c->response->redirect($c->uri_for()); + NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for); } sub create :Chained('levels_list') :PathPart('create') :Args(0) { @@ -273,7 +273,7 @@ sub pattern_delete :Chained('pattern_base') :PathPart('delete') { try { $c->stash->{pattern_result}->delete; $c->flash(messages => [{type => 'success', text => 'NCOS pattern successfully deleted'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->log->error("failed to delete ncos pattern: $e"); $c->flash(messages => [{type => 'error', text => 'Failed to delete NCOS pattern'}]); }; diff --git a/lib/NGCP/Panel/Controller/Peering.pm b/lib/NGCP/Panel/Controller/Peering.pm index 5dfabf3051..c6a69d09be 100644 --- a/lib/NGCP/Panel/Controller/Peering.pm +++ b/lib/NGCP/Panel/Controller/Peering.pm @@ -110,12 +110,11 @@ sub edit :Chained('base') :PathPart('edit') { $self->_sip_lcr_reload; delete $c->session->{created_objects}->{contract}; $c->flash(messages => [{type => 'success', text => 'Peering group successfully updated'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->flash(messages => [{type => 'error', text => 'Failed to update peering group'}]); - $c->log->info("Update failed: " . $e); + $c->log->error("failed to update peering group: $e"); }; - $c->response->redirect($c->uri_for()); - return; + NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for) } $c->stash(form => $form); @@ -129,9 +128,9 @@ sub delete :Chained('base') :PathPart('delete') { $c->stash->{group_result}->delete; $self->_sip_lcr_reload; $c->flash(messages => [{type => 'success', text => 'Peering Group successfully deleted'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->flash(messages => [{type => 'error', text => 'Failed to delete peering group'}]); - $c->log->info("Delete failed: " . $e); + $c->log->error("failed to delete peering group: $e"); }; $c->response->redirect($c->uri_for()); } @@ -161,9 +160,9 @@ sub create :Chained('group_list') :PathPart('create') :Args(0) { $self->_sip_lcr_reload; delete $c->session->{created_objects}->{contract}; $c->flash(messages => [{type => 'success', text => 'Peering group successfully created'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->flash(rules_messages => [{type => 'error', text => 'Failed to create peering group'}]); - $c->log->info("Create failed: " . $e); + $c->log->error("failed to create peering group: $e"); }; $c->response->redirect($c->uri_for_action('/peering/root')); return; @@ -211,7 +210,7 @@ sub servers_create :Chained('servers_list') :PathPart('create') :Args(0) { $c->stash->{group_result}->voip_peer_hosts->create($form->values); $self->_sip_lcr_reload; $c->flash(messages => [{type => 'success', text => 'Peering server successfully created'}]); - } catch (DBIx::Class::Exception $e) { + } catch($e) { $c->log->error("failed to create peering server: $e"); $c->flash(messages => [{type => 'error', text => 'Failed to create peering server'}]); }; @@ -267,8 +266,8 @@ sub servers_edit :Chained('servers_base') :PathPart('edit') :Args(0) { $c->stash->{server_result}->update($form->values); $self->_sip_lcr_reload; $c->flash(messages => [{type => 'success', text => 'Peering server successfully updated'}]); - } catch (DBIx::Class::Exception $e) { - $c->log->info("failed to update peering server: $e"); + } catch ($e) { + $c->log->error("failed to update peering server: $e"); $c->flash(messages => [{type => 'error', text => 'Failed to update peering server'}]); }; NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for_action('/peering/servers_root', [$c->req->captures->[0]])); @@ -288,7 +287,7 @@ sub servers_delete :Chained('servers_base') :PathPart('delete') :Args(0) { $c->stash->{server_result}->delete; $self->_sip_lcr_reload; $c->flash(messages => [{type => 'success', text => 'Peering server successfully deleted'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->log->error("failed to delete peering server: $e"); $c->flash(rules_messages => [{type => 'error', text => 'Failed to delete peering server'}]); }; @@ -413,7 +412,7 @@ sub rules_create :Chained('rules_list') :PathPart('create') :Args(0) { $c->stash->{group_result}->voip_peer_rules->create($form->values); $self->_sip_lcr_reload; $c->flash(rules_messages => [{type => 'success', text => 'Peering rule successfully created'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->log->error("failed to create peering rule: $e"); $c->flash(rules_messages => [{type => 'error', text => 'Failed to create peering rule'}]); }; @@ -470,7 +469,7 @@ sub rules_edit :Chained('rules_base') :PathPart('edit') :Args(0) { $c->stash->{rule_result}->update($form->values); $self->_sip_lcr_reload; $c->flash(rules_messages => [{type => 'success', text => 'Peering rule successfully changed'}]); - } catch (DBIx::Class::Exception $e) { + } catch ($e) { $c->log->error("failed to update peering rule: $e"); $c->flash(rules_messages => [{type => 'error', text => 'Failed to update peering rule'}]); }; @@ -491,8 +490,8 @@ sub rules_delete :Chained('rules_base') :PathPart('delete') :Args(0) { $c->stash->{rule_result}->delete; $self->_sip_lcr_reload; $c->flash(rules_messages => [{type => 'success', text => 'Peering rule successfully deleted'}]); - } catch (DBIx::Class::Exception $e) { - $c->log->info("failed to delete peering rule: $e"); + } catch ($e) { + $c->log->error("failed to delete peering rule: $e"); $c->flash(rules_messages => [{type => 'error', text => 'Failed to delete peering rule'}]); }; NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for_action('/peering/servers_root', [$c->req->captures->[0]])); diff --git a/lib/NGCP/Panel/Controller/Rewrite.pm b/lib/NGCP/Panel/Controller/Rewrite.pm index 817b7e0b18..6e8f94eadf 100644 --- a/lib/NGCP/Panel/Controller/Rewrite.pm +++ b/lib/NGCP/Panel/Controller/Rewrite.pm @@ -115,7 +115,7 @@ sub set_delete :Chained('set_base') :PathPart('delete') { $c->stash->{set_result}->delete; $c->flash(messages => [{type => 'success', text => 'Rewrite rule set successfully deleted'}]); } catch($e) { - $c->log->info("failed to delete rewrite rule set: $e"); + $c->log->error("failed to delete rewrite rule set: $e"); $c->flash(messages => [{type => 'error', text => 'Failed to delete rewrite rule set'}]); } NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for('/rewrite')); @@ -320,7 +320,7 @@ sub rules_delete :Chained('rules_base') :PathPart('delete') { $self->_sip_dialplan_reload(); $c->flash(messages => [{type => 'success', text => 'Rewrite rule successfully deleted'}]); } catch($e) { - $c->log->info("failed to delete rewrite rule: $e"); + $c->log->error("failed to delete rewrite rule: $e"); $c->flash(messages => [{type => 'error', text => 'Failed to delete rewrite rule'}]); }; NGCP::Panel::Utils::Navigation::back_or($c, $c->stash->{rules_uri}); diff --git a/lib/NGCP/Panel/Controller/Root.pm b/lib/NGCP/Panel/Controller/Root.pm index c9245323f5..ac620d2325 100644 --- a/lib/NGCP/Panel/Controller/Root.pm +++ b/lib/NGCP/Panel/Controller/Root.pm @@ -125,7 +125,7 @@ sub _prune_row { sub error_page :Private { my ($self,$c) = @_; - $c->log->info( 'Failed to find: ' . $c->request->path ); + $c->log->error( 'Failed to find path ' . $c->request->path ); $c->stash(template => 'error_page.tt'); #$c->response->body( 'Page not found' ); $c->response->status(404); @@ -134,7 +134,7 @@ sub error_page :Private { sub denied_page :Private { my ($self,$c) = @_; - $c->log->info('Access to path denied: ' . $c->request->path ); + $c->log->error('Access denied to path ' . $c->request->path ); $c->stash(template => 'denied_page.tt'); $c->response->status(403); } diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm index 092b66fc15..2844ccfd09 100644 --- a/lib/NGCP/Panel/Controller/Subscriber.pm +++ b/lib/NGCP/Panel/Controller/Subscriber.pm @@ -1990,7 +1990,7 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) { $recording, 'WAV', 'WAV'); } catch ($error) { $c->flash(messages => [{type => 'error', text => 'Transcode of audio file failed!'}]); - $c->log->info("Transcode failed: $error"); + $c->log->error("failed to transcode file: $error"); NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for_action('/subscriber/details', [$c->req->captures->[0]])); }