View | Details | Raw Unified | Return to bug 37963
Collapse All | Expand All

(-)a/Koha/ERM/EUsage/UsageDataProvider.pm (-8 / +6 lines)
Lines 180-187 sub harvest_sushi { Link Here
180
    $ua->agent( 'Koha/' . Koha::version() );
180
    $ua->agent( 'Koha/' . Koha::version() );
181
    my $response = $ua->simple_request($request);
181
    my $response = $ua->simple_request($request);
182
182
183
    my $result   = decode_json( $response->decoded_content );
184
183
    if ( $response->code >= 400 ) {
185
    if ( $response->code >= 400 ) {
184
        my $result = decode_json( $response->decoded_content );
186
187
        return if $self->_sushi_errors($result);
185
188
186
        my $message;
189
        my $message;
187
        if ( ref($result) eq 'ARRAY' ) {
190
        if ( ref($result) eq 'ARRAY' ) {
Lines 199-205 sub harvest_sushi { Link Here
199
            }
202
            }
200
        }
203
        }
201
204
202
        #TODO: May want to add a job error message here?
203
        warn sprintf "ERROR - SUSHI service %s returned %s - %s\n", $url,
205
        warn sprintf "ERROR - SUSHI service %s returned %s - %s\n", $url,
204
            $response->code, $message;
206
            $response->code, $message;
205
        if ( $response->code == 404 ) {
207
        if ( $response->code == 404 ) {
Lines 208-214 sub harvest_sushi { Link Here
208
            Koha::Exceptions::Authorization::Unauthorized->throw($message);
210
            Koha::Exceptions::Authorization::Unauthorized->throw($message);
209
        } else {
211
        } else {
210
212
211
            #TODO: May want to add a job error message here?
212
            die sprintf "ERROR requesting SUSHI service\n%s\ncode %s: %s\n",
213
            die sprintf "ERROR requesting SUSHI service\n%s\ncode %s: %s\n",
213
                $url, $response->code,
214
                $url, $response->code,
214
                $message;
215
                $message;
Lines 217-228 sub harvest_sushi { Link Here
217
        return;
218
        return;
218
    }
219
    }
219
220
220
    my $decoded_response = decode_json( $response->decoded_content );
221
    return if $self->_sushi_errors($result);
221
222
    return if $self->_sushi_errors($decoded_response);
223
222
224
    # Parse the SUSHI response
223
    # Parse the SUSHI response
225
    my $sushi_counter = Koha::ERM::EUsage::SushiCounter->new( { response => $decoded_response } );
224
    my $sushi_counter = Koha::ERM::EUsage::SushiCounter->new( { response => $result } );
226
    my $counter_file  = $sushi_counter->get_COUNTER_from_SUSHI;
225
    my $counter_file  = $sushi_counter->get_COUNTER_from_SUSHI;
227
226
228
    return if $self->_counter_file_size_too_large($counter_file);
227
    return if $self->_counter_file_size_too_large($counter_file);
229
- 

Return to bug 37963