TT#56340 fix subscribers.t not matching obfuscation chars

Change-Id: I7023d1e23fc397e3556705fc52db50eace6c02b4
changes/13/30613/2
Rene Krenn 6 years ago
parent 157206a6bb
commit dda5ffe48f

@ -409,7 +409,7 @@ sub POST :Allow {
} catch(DBIx::Class::Exception $e where { /Duplicate entry '([^']+)' for key 'number_idx'/ }) { } catch(DBIx::Class::Exception $e where { /Duplicate entry '([^']+)' for key 'number_idx'/ }) {
$e =~ /Duplicate entry '([^']+)' for key 'number_idx'/; $e =~ /Duplicate entry '([^']+)' for key 'number_idx'/;
$c->log->error("failed to create subscriber, number " . $c->qs($1) . " already exists"); # TODO: user, message, trace, ... $c->log->error("failed to create subscriber, number " . $c->qs($1) . " already exists"); # TODO: user, message, trace, ...
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number '" . $c->qs($1) . "' already exists."); $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number '" . $1 . "' already exists.", "Number already exists.");
last; last;
} catch($e) { } catch($e) {
if (ref $error_info->{extended} eq 'HASH' && $error_info->{extended}->{response_code}) { if (ref $error_info->{extended} eq 'HASH' && $error_info->{extended}->{response_code}) {

@ -346,9 +346,10 @@ sub validate_fields {
} }
sub error { sub error {
my ($self, $c, $code, $message) = @_; my ($self, $c, $code, $message, $insensitive_message) = @_;
$c->log->error("error $code - $message"); # TODO: user, trace etc my $msg = $insensitive_message // $message;
$c->log->error("error $code - $msg"); # TODO: user, trace etc
$c->response->content_type('application/json'); $c->response->content_type('application/json');
$c->response->status($code); $c->response->status($code);

@ -707,7 +707,7 @@ sub update_item {
} catch(DBIx::Class::Exception $e where { /Duplicate entry '([^']+)' for key 'number_idx'/ }) { } catch(DBIx::Class::Exception $e where { /Duplicate entry '([^']+)' for key 'number_idx'/ }) {
$e =~ /Duplicate entry '([^']+)' for key 'number_idx'/; $e =~ /Duplicate entry '([^']+)' for key 'number_idx'/;
$c->log->error("failed to update subscriber, number " . $c->qs($1) . " already exists"); # TODO: user, message, trace, ... $c->log->error("failed to update subscriber, number " . $c->qs($1) . " already exists"); # TODO: user, message, trace, ...
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number '" . $c->qs($1) . "' already exists."); $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number '" . $1 . "' already exists.", "Number already exists.");
return; return;
} }

Loading…
Cancel
Save