diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Script/Reports.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/SendReport.pm | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b84403b98..89606fe01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,7 @@ - Development improvements: - Add hook for pre-wrapper content. - Include JSON representation of extra fields in category_extras output + - send-reports will never skip failed reports when using --debug - UK: - Use SVG logo, inlined on front page. #1887 - Inline critical CSS on front page. #1893 diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm index aca894d03..7e14fbb1e 100644 --- a/perllib/FixMyStreet/Script/Reports.pm +++ b/perllib/FixMyStreet/Script/Reports.pm @@ -159,7 +159,7 @@ sub send(;$) { } } - if ( $reporters{ $sender }->should_skip( $row ) ) { + if ( $reporters{ $sender }->should_skip( $row, $debug_mode ) ) { $skip = 1; debug_print("skipped by sender " . $sender_info->{method} . " (might be due to previous failed attempts?)", $row->id) if $debug_mode; } else { diff --git a/perllib/FixMyStreet/SendReport.pm b/perllib/FixMyStreet/SendReport.pm index 40ec4caf2..2739e3043 100644 --- a/perllib/FixMyStreet/SendReport.pm +++ b/perllib/FixMyStreet/SendReport.pm @@ -19,10 +19,12 @@ has 'unconfirmed_notes' => ( 'is' => 'rw', isa => HashRef, default => sub { {} } sub should_skip { - my $self = shift; - my $row = shift; + my $self = shift; + my $row = shift; + my $debug = shift; return 0 unless $row->send_fail_count; + return 0 if $debug; my $now = DateTime->now( time_zone => FixMyStreet->local_time_zone ); my $diff = $now - $row->send_fail_timestamp; |