heroku debugging

jookies · Feb 24, 2022 · 838b77e · 838b77e
1 parent 98c02b6
commit 838b77e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/jasmin/queues/configs.py b/jasmin/queues/configs.py
@@ -13,20 +13,31 @@
 CONFIG_PATH = os.getenv('CONFIG_PATH', '%s/etc/jasmin/' % ROOT_PATH)
 RESOURCE_PATH = os.getenv('RESOURCE_PATH', '%s/resource/' % CONFIG_PATH)
 LOG_PATH = os.getenv('LOG_PATH', '%s/var/log/jasmin/' % ROOT_PATH)
+CLOUDAMQP_URL = os.getenv('CLOUDAMQP_URL', None)
 
 class AmqpConfig(ConfigFile):
     """Config handler for 'amqp-broker' section"""
 
     def __init__(self, config_file=None):
         ConfigFile.__init__(self, config_file)
 
-        self.host = self._get('amqp-broker', 'host', '127.0.0.1')
-        self.port = self._getint('amqp-broker', 'port', 5672)
-        self.username = self._get('amqp-broker', 'username', 'guest')
-        self.password = self._get('amqp-broker', 'password', 'guest')
-        self.vhost = self._get('amqp-broker', 'vhost', '/')
-        self.spec = self._get('amqp-broker', 'spec', '%s/amqp0-9-1.xml' % RESOURCE_PATH)
-        self.heartbeat = self._getint('amqp-broker', 'heartbeat', 0)
+        if CLOUDAMQP_URL is not None:
+            print(CLOUDAMQP_URL)
+            self.host = self._get('amqp-broker', 'host', '127.0.0.1')
+            self.port = self._getint('amqp-broker', 'port', 5672)
+            self.username = self._get('amqp-broker', 'username', 'guest')
+            self.password = self._get('amqp-broker', 'password', 'guest')
+            self.vhost = self._get('amqp-broker', 'vhost', '/')
+            self.spec = self._get('amqp-broker', 'spec', '%s/amqp0-9-1.xml' % RESOURCE_PATH)
+            self.heartbeat = self._getint('amqp-broker', 'heartbeat', 0)
+        else:
+            self.host = self._get('amqp-broker', 'host', '127.0.0.1')
+            self.port = self._getint('amqp-broker', 'port', 5672)
+            self.username = self._get('amqp-broker', 'username', 'guest')
+            self.password = self._get('amqp-broker', 'password', 'guest')
+            self.vhost = self._get('amqp-broker', 'vhost', '/')
+            self.spec = self._get('amqp-broker', 'spec', '%s/amqp0-9-1.xml' % RESOURCE_PATH)
+            self.heartbeat = self._getint('amqp-broker', 'heartbeat', 0)
 
         # Logging
         self.log_level = logging.getLevelName(self._get('amqp-broker', 'log_level', 'INFO'))

diff --git a/jasmin/redis/client.py b/jasmin/redis/client.py
@@ -68,7 +68,7 @@ def makeConnection(host, port, dbid, poolsize, reconnect, isLazy, _RedisForJasmi
     factory = RedisForJasminFactory(uuid, None, poolsize, isLazy, redis.ConnectionHandler, _RedisForJasminConfig)
     factory.continueTrying = reconnect
     for _ in range(poolsize):
-        reactor.connectTCP(host, port, factory)
+        reactor.connectTCP(host, int(port), factory)
 
     if isLazy:
         return factory.handler

diff --git a/jasmin/redis/configs.py b/jasmin/redis/configs.py
@@ -4,11 +4,13 @@
 
 import logging
 import os
+import re
 
 from jasmin.config import ConfigFile
 
 ROOT_PATH = os.getenv('ROOT_PATH', '/')
 LOG_PATH = os.getenv('LOG_PATH', '%s/var/log/jasmin/' % ROOT_PATH)
+REDIS_URL = os.getenv('REDIS_URL', None)
 
 
 class RedisForJasminConfig(ConfigFile):
@@ -17,10 +19,16 @@ class RedisForJasminConfig(ConfigFile):
     def __init__(self, config_file=None):
         ConfigFile.__init__(self, config_file)
 
-        self.host = self._get('redis-client', 'host', '127.0.0.1')
-        self.port = self._getint('redis-client', 'port', 6379)
+        if REDIS_URL is not None:
+            # Take redis config from REDIS_URL env variable (used by heroku)
+            self.password, self.host, self.port = \
+                re.search(r"^redis\:\/\/\:([a-z0-9]+)@((?!-)[-a-zA-Z0-9.]{1,63}(?<!-))\:(\d+)$", REDIS_URL).groups()
+        else:
+            self.host = self._get('redis-client', 'host', '127.0.0.1')
+            self.port = self._getint('redis-client', 'port', 6379)
+            self.password = self._get('redis-client', 'password', None)
+
         self.dbid = self._getint('redis-client', 'dbid', '0')
-        self.password = self._get('redis-client', 'password', None)
         self.poolsize = self._getint('redis-client', 'poolsize', 10)
 
         self.log_level = logging.getLevelName(self._get('redis-client', 'log_level', 'INFO'))