aboutsummaryrefslogtreecommitdiffstats
path: root/perllib
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2016-05-03 09:57:49 +0100
committerMatthew Somerville <matthew@mysociety.org>2016-05-03 09:57:49 +0100
commitfee5734316c3b253af81ede5a1f382801ac64591 (patch)
treed5908204adb7887689245e174555919c5d457cfe /perllib
parentbf165e6b5ab09e32b1806e06a837bda1bdec40db (diff)
parent287aeeb8ca593e7d547ea1595abf3d942a7139cf (diff)
Merge remote-tracking branch 'origin/open311-quieten-issues'
Diffstat (limited to 'perllib')
-rw-r--r--perllib/FixMyStreet/SendReport/Angus.pm1
-rw-r--r--perllib/FixMyStreet/SendReport/EastHants.pm1
-rw-r--r--perllib/FixMyStreet/SendReport/Open311.pm7
3 files changed, 2 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/SendReport/Angus.pm b/perllib/FixMyStreet/SendReport/Angus.pm
index 15441cc1f..cab5de173 100644
--- a/perllib/FixMyStreet/SendReport/Angus.pm
+++ b/perllib/FixMyStreet/SendReport/Angus.pm
@@ -160,7 +160,6 @@ sub send {
}
} catch {
my $e = $_;
- print "Caught an error: $e\n";
$self->error( "Error sending to Angus: $e" );
};
$self->success( !$return );
diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm
index cc302b8b3..55ec79613 100644
--- a/perllib/FixMyStreet/SendReport/EastHants.pm
+++ b/perllib/FixMyStreet/SendReport/EastHants.pm
@@ -52,7 +52,6 @@ sub send {
$return = 0 if $result eq 'Report received';
} catch {
my $e = $_;
- print "Caught an error: $e\n";
$self->error( "Error sending to East Hants: $e" );
};
$self->success( !$return );
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 5c7fa30f3..bf5ed3e30 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -144,14 +144,11 @@ sub send {
$self->success( 1 );
} else {
$result *= 1;
- # temporary fix to resolve some issues with west berks
- if ( $row->bodies_str =~ /2619/ ) {
- $result *= 0;
- }
+ $self->error( "Failed to send over Open311\n" ) unless $self->error;
+ $self->error( $self->error . "\n" . $open311->error );
}
}
- $self->error( 'Failed to send over Open311' ) unless $self->success;
return $result;
}