@@ -, +, @@
broker
---
Koha/BackgroundJob.pm | 24 ++++++++++++++++++++++--
debian/templates/koha-conf-site.xml.in | 8 ++++++++
etc/koha-conf.xml | 8 ++++++++
3 files changed, 38 insertions(+), 2 deletions(-)
--- a/Koha/BackgroundJob.pm
+++ a/Koha/BackgroundJob.pm
@@ -62,8 +62,28 @@ 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 $config = C4::Context->config('message_broker');
+ my $credentials = {
+ login => 'guest',
+ passcode => 'guest',
+ };
+ if ($config){
+ $hostname = $config->{hostname} if $config->{hostname};
+ $port = $config->{port} if $config->{port};
+ $credentials->{login} = $config->{username} if $config->{username};
+ $credentials->{passcode} = $config->{password} if $config->{password};
+ $credentials->{host} = $config->{vhost} if $config->{vhost};
+ }
+ my $stomp = Net::Stomp->new( { hostname => $hostname, port => $port } );
+ my $frame = $stomp->connect( $credentials );
+ unless ($frame && $frame->command eq 'CONNECTED'){
+ if ($frame){
+ warn $frame->as_string;
+ }
+ die "Cannot connect to message broker";
+ }
return $stomp;
}
--- a/debian/templates/koha-conf-site.xml.in
+++ a/debian/templates/koha-conf-site.xml.in
@@ -455,5 +455,13 @@ __END_SRU_PUBLICSERVER__
__SMTP_DEBUG__
+
+ localhost
+ 61613
+ guest
+ guest
+
+
+
--- a/etc/koha-conf.xml
+++ a/etc/koha-conf.xml
@@ -272,5 +272,13 @@ __PAZPAR2_TOGGLE_XML_POST__
__SMTP_DEBUG__
+
+ localhost
+ 61613
+ guest
+ guest
+
+
+
--