Fixed the deprecated stuff and added slight debug code

diff --git a/Dockerfile b/Dockerfile
index 7ab1f20d0881f362992a874e5dc614fae4c7c918..a5e53f6034fe2ec0f112b0fb6e7b34b0acb03724 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ RUN apk add py3-pip
 RUN apk add py3-cffi
 RUN apk add gcc
 RUN apk add make
+RUN pip3 install SSLContext
 RUN pip3 install pynacl
 RUN pip3 install discord.py asynqp
 RUN pip3 install aioprometheus

diff --git a/grahbot.py b/grahbot.py
index 0ca591267ca10d6c645f4bbe1b49982abe03f999..94bd7060b85fdc674251a54454ef0987d9069f0b 100755 (executable)
--- a/grahbot.py
+++ b/grahbot.py
@@ -4,6 +4,7 @@ import discord
 import socket
 import random
 import ssl
+import sslcontext
 import asynqp
 import discord.voice_client
 import datetime
@@ -106,12 +107,12 @@ class HornClient(object):
         log.debug('>> {}'.format(msg.body))
 
     async def rabbit_connect(self):
-        log.debug('Creating rabbitmq socket')
+        log.debug('Creating rabbitmq socket to {}:{}'.format(self.rabbit_config['host'], int(self.rabbit_config['port'])))
         # CREATE SOCKET
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
         # WRAP SOCKET
-        sock = ssl.wrap_socket(sock)
+        sock = sslcontext.wrap_socket(sock)
         sock.connect((self.rabbit_config['host'], int(self.rabbit_config['port'])))
 
         connection = await asynqp.connect(virtual_host=self.rabbit_config['vhost'], username=self.rabbit_config['user'], password=self.rabbit_config['password'], sock=sock)