Skip to content

Commit 2c5afcc

Browse files
committed
fix (StompMQConnector): adapt to stomp 8
1 parent 7ff48a8 commit 2c5afcc

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/DIRAC/Resources/MessageQueue/StompMQConnector.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ def setupConnection(self, parameters=None):
8989
"reconnect_sleep_jitter": reconnectSleepJitter,
9090
"reconnect_attempts_max": reconnectAttemptsMax,
9191
}
92+
sslArgs = None
9293

9394
# We use ssl credentials and not user-password.
9495
if sslVersion is not None:
@@ -101,9 +102,13 @@ def setupConnection(self, parameters=None):
101102
return S_ERROR("Could not find a certificate!")
102103
hostcert = paths[0]
103104
hostkey = paths[1]
104-
connectionArgs.update(
105-
{"use_ssl": True, "ssl_version": sslVersion, "ssl_key_file": hostkey, "ssl_cert_file": hostcert}
106-
)
105+
sslArgs = {
106+
"use_ssl": True,
107+
"ssl_version": sslVersion,
108+
"ssl_key_file": hostkey,
109+
"ssl_cert_file": hostcert,
110+
}
111+
107112
else:
108113
return S_ERROR(EMQCONN, "Invalid SSL version provided: %s" % sslVersion)
109114

@@ -125,6 +130,8 @@ def setupConnection(self, parameters=None):
125130
connectionArgs.update({"host_and_ports": host_and_ports})
126131
log.debug("Connection args: %s" % str(connectionArgs))
127132
self.connection = stomp.Connection(**connectionArgs)
133+
if sslArgs:
134+
self.connection.set_ssl(**sslArgs)
128135

129136
except Exception as e:
130137
log.debug("Failed setting up connection", repr(e))

0 commit comments

Comments
 (0)