Attachment 112013 Details for Bug 26742 – Bug 26742: Add configuration to koha-conf.xml for message broker

[patch] Bug 26742: Add configuration to koha-conf.xml for message broker

Bug-26742-Add-configuration-to-koha-confxml-for-me.patch (text/plain), 2.71 KB, created by David Cook on 2020-10-20 00:56:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cook

Created: 2020-10-20 00:56:04 UTC

Size: 2.71 KB

patch

obsolete

>From 8c68019cf3c6a205dfccc27379bc142ce857ce17 Mon Sep 17 00:00:00 2001
>From: David Cook <dcook@prosentient.com.au>
>Date: Tue, 20 Oct 2020 11:54:46 +1100
>Subject: [PATCH] Bug 26742: Add configuration to koha-conf.xml for message
> broker
>
>The connection details for the message broker should be configurable.
>This patch adds configuration options to koha-conf.xml. If they
>are not specified, then default connection details will be used.
>---
> Koha/BackgroundJob.pm                  | 17 +++++++++++++++--
> debian/templates/koha-conf-site.xml.in |  8 ++++++++
> etc/koha-conf.xml                      |  8 ++++++++
> 3 files changed, 31 insertions(+), 2 deletions(-)
>
>diff --git a/Koha/BackgroundJob.pm b/Koha/BackgroundJob.pm
>index 0b1b36de50..bbf3e1f4e9 100644
>--- a/Koha/BackgroundJob.pm
>+++ b/Koha/BackgroundJob.pm
>@@ -62,8 +62,21 @@ Connect to the message broker using default guest/guest credential
> 
> sub connect {
>     my ( $self );
>-    my $stomp = Net::Stomp->new( { hostname => 'localhost', port => '61613' } );
>-    $stomp->connect( { login => 'guest', passcode => 'guest' } );
>+    my $hostname = 'localhost';
>+    my $port = '61613';
>+    my $username = 'guest';
>+    my $password = 'guest';
>+    my $vhost = '';
>+    my $config = C4::Context->config('message_broker');
>+    if ($config){
>+        $hostname = $config->{hostname} if $config->{hostname};
>+        $port = $config->{port} if $config->{port};
>+        $username = $config->{username} if $config->{username};
>+        $password = $config->{password} if $config->{password};
>+        $vhost = $config->{vhost} if $config->{vhost};
>+    }
>+    my $stomp = Net::Stomp->new( { hostname => $hostname, port => $port } );
>+    $stomp->connect( { login => $username, passcode => $password, host => $vhost } );
>     return $stomp;
> }
> 
>diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
>index 2a5afa6610..0fdaa5af51 100644
>--- a/debian/templates/koha-conf-site.xml.in
>+++ b/debian/templates/koha-conf-site.xml.in
>@@ -453,5 +453,13 @@ __END_SRU_PUBLICSERVER__
>     <debug>__SMTP_DEBUG__</debug>
>  </smtp_server>
> 
>+ <message_broker>
>+   <hostname>localhost</hostname>
>+   <port>61613</port>
>+   <username>guest</username>
>+   <password>guest</password>
>+   <vhost></vhost>
>+ </message_broker>
>+
> </config>
> </yazgfs>
>diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
>index eff50d2bcd..11e0e79f73 100644
>--- a/etc/koha-conf.xml
>+++ b/etc/koha-conf.xml
>@@ -270,5 +270,13 @@ __PAZPAR2_TOGGLE_XML_POST__
>     <debug>__SMTP_DEBUG__</debug>
>  </smtp_server>
> 
>+ <message_broker>
>+   <hostname>localhost</hostname>
>+   <port>61613</port>
>+   <username>guest</username>
>+   <password>guest</password>
>+   <vhost></vhost>
>+ </message_broker>
>+
> </config>
> </yazgfs>
>-- 
>2.16.4

Actions: View | Diff | Splinter Review

Attachments on bug 26742: 112013 | 112015 | 113906 | 114288 | 114372 | 117533 | 117534