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

(-)a/about.pl (-14 / +10 lines)
Lines 178-184 if ( $tab eq 'about' ) { Link Here
178
        $where_is_memcached_config = 'config_only';
178
        $where_is_memcached_config = 'config_only';
179
    }
179
    }
180
180
181
    message_broker_check($template);
181
    job_notification_method_check($template);
182
    elasticsearch_check($template);
182
    elasticsearch_check($template);
183
183
184
    $template->param(
184
    $template->param(
Lines 606-612 if($tab eq 'sysinfo') { Link Here
606
        $template->param( warnFastCataloging => $no_FA_framework );
606
        $template->param( warnFastCataloging => $no_FA_framework );
607
    }
607
    }
608
608
609
    message_broker_check($template);
609
    job_notification_method_check($template);
610
610
611
    #BZ 28267: Warn administrators if there are database rows with a format other than 'DYNAMIC'
611
    #BZ 28267: Warn administrators if there are database rows with a format other than 'DYNAMIC'
612
    {
612
    {
Lines 909-930 sub elasticsearch_check { Link Here
909
    }
909
    }
910
}
910
}
911
911
912
sub message_broker_check {
912
sub job_notification_method_check {
913
    my $template = shift;
913
    my ($template) = @_;
914
    {
914
915
    if ( C4::Context->preference('JobsNotificationMethod') eq 'STOMP' ) {
916
915
        # BackgroundJob - test connection to message broker
917
        # BackgroundJob - test connection to message broker
916
        my $conn = Koha::BackgroundJob->connect;
918
        my $conn = Koha::BackgroundJob->connect;
917
        if (! $conn) {
919
        if ( !$conn ) {
918
            if (C4::Context->preference('JobsNotificationMethod') eq 'STOMP' ) {
920
            $template->param( warnConnectBroker => 1 );
919
                $template->param( warnConnectBroker => 'Error connecting' );
920
            } else {
921
                $template->param(
922
                    warnConnectBroker => C4::Context->preference('JobsNotificationMethod')
923
                );
924
            }
925
        }
921
        }
926
    }
922
    }
927
  }
923
}
928
924
929
if ( $tab eq 'database' ) {
925
if ( $tab eq 'database' ) {
930
    use Koha::Database::Auditor;
926
    use Koha::Database::Auditor;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-5 / +6 lines)
Lines 205-216 Link Here
205
            </tr>
205
            </tr>
206
            <tr>
206
            <tr>
207
                <th scope="row">Message broker: </th>
207
                <th scope="row">Message broker: </th>
208
                [% IF warnConnectBroker == 'Error connecting' %]
208
                [% IF warnConnectBroker %]
209
                    <td class="text-bg-warning"><strong>Using SQL polling (Fallback, Error connecting to RabbitMQ)</strong></td>
209
                    <td class="text-bg-warning"><strong>Using SQL polling (Fallback, Error connecting to RabbitMQ)</strong></td>
210
                [% ELSIF warnConnectBroker %]
211
                    <td class="text-bg-warning"><strong>Using SQL polling</strong></td>
212
                [% ELSE %]
210
                [% ELSE %]
213
                    <td class="text-bg-info">Using RabbitMQ</td>
211
                    [% IF Koha.Preference('JobsNotificationMethod') == 'polling' %]
212
                        <td class="text-bg-info">Using SQL polling</td>
213
                    [% ELSE %]
214
                        <td class="text-bg-info">Using RabbitMQ</td>
215
                    [% END %]
214
                [% END %]
216
                [% END %]
215
            </tr>
217
            </tr>
216
            <tr>
218
            <tr>
217
- 

Return to bug 38988