Implement caching for slack channels

pyslackers · Jun 23, 2019 · 08985f7 · 08985f7
1 parent a4eef5e
commit 08985f7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 32 deletions.
diff --git a/pyslackersweb/website/__init__.py b/pyslackersweb/website/__init__.py
@@ -19,9 +19,7 @@ def app_factory() -> web.Application:
     website.update(  # pylint: disable=no-member
         redis_uri=settings.REDIS_URL,
         slack_invite_token=settings.SLACK_INVITE_TOKEN,
-        slack_timezones={},
         slack_token=settings.SLACK_TOKEN,
-        slack_user_count=0,
     )
 
     # aiohttp_jinja2 requires this values to be set. Sadly it does not work with subapplication.

diff --git a/pyslackersweb/website/contexts.py b/pyslackersweb/website/contexts.py
@@ -39,11 +39,12 @@ async def background_jobs(app: web.Application) -> None:
     )
 
     scheduler.add_job(
-        tasks.sync_slack_channels(app),
+        tasks.sync_slack_channels,
         "cron",
         minute=15,
         jitter=30,
         next_run_time=datetime.utcnow() + timedelta(seconds=60),
+        args=(app["slack_client"], app["redis"]),
     )
 
     yield

diff --git a/pyslackersweb/website/tasks.py b/pyslackersweb/website/tasks.py
@@ -5,7 +5,7 @@
 from typing import List
 
 import slack
-from aiohttp import ClientSession, web
+from aiohttp import ClientSession
 from aioredis.abc import AbcConnection
 from slack.io.abc import SlackAPI
 
@@ -16,6 +16,8 @@
 
 GITHUB_REPO_CACHE_KEY = "github:repos"
 
+SLACK_CHANNEL_CACHE_KEY = "slack:channels"
+
 SLACK_COUNT_CACHE_KEY = "slack:user:count"
 
 SLACK_TZ_CACHE_KEY = "slack:user:timezones"
@@ -107,36 +109,30 @@ async def sync_slack_users(
         return
 
 
-def sync_slack_channels(app: web.Application):
-    client = app["slack_client"]
-
-    async def _sync_slack_channel():
-        logger.debug("Refreshing slack channels cache.")
-        oauth_token = app["slack_token"]
-
-        if oauth_token is None:
-            logger.error("No slack oauth token set, unable to sync slack channels.")
-            return
-
-        try:
-            channels = []
-            async for channel in client.iter(slack.methods.CHANNELS_LIST):
-                channels.append(
-                    Channel(
-                        id=channel["id"],
-                        name=channel["name"],
-                        topic=channel["topic"]["value"],
-                        purpose=channel["purpose"]["value"],
-                        members=channel["num_members"],
-                    )
+async def sync_slack_channels(
+    slack_client: SlackAPI, redis: AbcConnection, *, cache_key: str = SLACK_CHANNEL_CACHE_KEY
+):
+    logger.debug("Refreshing slack channels cache.")
+
+    try:
+        channels = []
+        async for channel in slack_client.iter(slack.methods.CHANNELS_LIST):
+            channels.append(
+                Channel(
+                    id=channel["id"],
+                    name=channel["name"],
+                    topic=channel["topic"]["value"],
+                    purpose=channel["purpose"]["value"],
+                    members=channel["num_members"],
                 )
+            )
 
-            logger.debug("Found %s slack channels", len(channels))
+        channels.sort(key=lambda c: c.name)
 
-            app.update(slack_channels=sorted(channels, key=lambda c: c.name))
+        logger.debug("Found %s slack channels", len(channels))
 
-        except Exception:  # pylint: disable=broad-except
-            logger.exception("Error refreshing slack channels cache")
-            return
+        await redis.set(cache_key, json.dumps([x.__dict__ for x in channels]))
 
-    return _sync_slack_channel
+    except Exception:  # pylint: disable=broad-except
+        logger.exception("Error refreshing slack channels cache")
+        return