From fa09096744496298da3baadb63a5c407f34b7192 Mon Sep 17 00:00:00 2001 From: Rusty Bower Date: Thu, 18 Jan 2018 12:57:40 -0600 Subject: [PATCH 1/2] redis: fixing documenation in redis.stoq --- source/redis/redis/redis.stoq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/redis/redis/redis.stoq b/source/redis/redis/redis.stoq index be33678..d1e14e6 100644 --- a/source/redis/redis/redis.stoq +++ b/source/redis/redis/redis.stoq @@ -29,6 +29,6 @@ min_stoq_version = 0.10.13 # Does this plugin support multiprocessing? multiprocess = False -# Host of the RabbitMQ server +# Host of the Redis server redis_host = 127.0.0.1 redis_port = 6379 From 380f3c00a8000836c3b4b5875de309bcc196e4f8 Mon Sep 17 00:00:00 2001 From: Rusty Bower Date: Tue, 23 Jan 2018 10:34:19 -0500 Subject: [PATCH 2/2] slack: handling dictionary returns from slack api --- worker/slack/slack/slack.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worker/slack/slack/slack.py b/worker/slack/slack/slack.py index dc62ef5..e9c0586 100644 --- a/worker/slack/slack/slack.py +++ b/worker/slack/slack/slack.py @@ -347,7 +347,8 @@ def get_user_info(self, id): # Use Slack's user.info API call to gather information on the user # that submitted the file userinfo = self.slackclient.api_call("users.info", **{'user': id}) - userinfo = self.stoq.loads(userinfo) + if type(userinfo) is not dict: + userinfo = self.stoq.loads(userinfo) # If an error was produced, return that instead if 'error' in userinfo: