Skip to content

Commit

Permalink
Set mqtt TLS info explicitly
Browse files Browse the repository at this point in the history
Signed-off-by: Kipchirchir Sigei <[email protected]>
  • Loading branch information
KipSigei committed Feb 22, 2024
1 parent 2cb42b4 commit 12de991
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
4 changes: 3 additions & 1 deletion docker/onadata-uwsgi/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ RUN apt-get install -y --no-install-recommends \
openjdk-11-jre-headless \
libpcre3 \
libpcre3-dev \
ca-certificates \
&& apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& update-ca-certificates --fresh

# Create OnaData user and add to tty group
RUN useradd -G tty -m onadata
Expand Down
20 changes: 9 additions & 11 deletions onadata/apps/messaging/backends/mqtt.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from django.conf import settings

from paho.mqtt import publish
import paho.mqtt.client as mqttClient

from onadata.apps.logger.models import XForm
from onadata.apps.messaging.backends.base import BaseBackend
Expand Down Expand Up @@ -151,14 +151,12 @@ def send(self, instance):
"""
topic = self.get_topic(instance)
payload = get_payload(instance)
# send it

return publish.single(
topic,
payload=payload,
hostname=self.host,
port=self.port,
tls=self.cert_info,
qos=self.qos,
retain=self.retain,
)
# send it
client = mqttClient.Client()
if self.cert_info:
client.tls_set(**self.cert_info)
client.connect(self.host, self.port)
client.publish(topic, payload, self.qos, self.retain)
client.disconnect()
return True

0 comments on commit 12de991

Please sign in to comment.