work-load-fixes

services/zine/shoutauthor.py

@@ -1,22 +1,23 @@
 import asyncio
 
 from base.orm import local_session
-from orm.shout import ShoutAuthor
+from orm.shout import ShoutAuthor, Shout
 
 
 class ShoutAuthorStorage:
     authors_by_shout = {}
+    shouts_by_author = {}
     lock = asyncio.Lock()
     period = 30 * 60  # sec
 
     @staticmethod
     async def load(session):
         self = ShoutAuthorStorage
-        sas = session.query(ShoutAuthor).all()
+        sas = session.query(ShoutAuthor).join(Shout).all()
         for sa in sas:
             self.authors_by_shout[sa.shout] = self.authors_by_shout.get(sa.shout, [])
             self.authors_by_shout[sa.shout].append([sa.user, sa.caption])
-        print("[zine.authors] %d shouts preprocessed" % len(self.authors_by_shout))
+        print("[zine.shouts] %d shouts indexed by authors" % len(self.authors_by_shout))
 
     @staticmethod
     async def get_authors(shout):
@@ -41,7 +42,7 @@ class ShoutAuthorStorage:
                 with local_session() as session:
                     async with self.lock:
                         await self.load(session)
-                        print("[zine.authors] state updated")
+                        print("[zine.shouts] index by authors was updated")
             except Exception as err:
-                print("[zine.authors] errror: %s" % (err))
+                print("[zine.shouts] error indexing by author: %s" % (err))
             await asyncio.sleep(self.period)

services/zine/shoutscache.py

@@ -244,6 +244,16 @@ class ShoutsCache:
             print("[zine.cache] indexed by %d authors " % len(shouts_by_author.keys()))
             ShoutsCache.by_author = shouts_by_author
 
+    @staticmethod
+    async def get_by_author(author):
+        async with ShoutsCache.lock:
+            return ShoutsCache.by_author.get(author, [])
+
+    @staticmethod
+    async def get_by_topic(topic):
+        async with ShoutsCache.lock:
+            return ShoutsCache.by_topic.get(topic, [])
+
     @staticmethod
     async def get_top_published_before(daysago, offset, limit):
         shouts_by_rating = []

services/zine/shouttopic.py

@@ -1,38 +0,0 @@
-import asyncio
-
-from base.orm import local_session
-from orm.shout import ShoutTopic
-
-
-class ShoutTopicStorage:
-    topics_by_shout = {}
-    lock = asyncio.Lock()
-    period = 30 * 60  # sec
-
-    @staticmethod
-    async def load(session):
-        self = ShoutTopicStorage
-        sas = session.query(ShoutTopic).all()
-        for sa in sas:
-            self.topics_by_shout[sa.shout] = self.topics_by_shout.get(sa.shout, [])
-            self.topics_by_shout[sa.shout].append([sa.user, sa.caption])
-        print("[zine.topics] %d shouts preprocessed" % len(self.topics_by_shout))
-
-    @staticmethod
-    async def get_topics(shout):
-        self = ShoutTopicStorage
-        async with self.lock:
-            return self.topics_by_shout.get(shout, [])
-
-    @staticmethod
-    async def worker():
-        self = ShoutTopicStorage
-        while True:
-            try:
-                with local_session() as session:
-                    async with self.lock:
-                        await self.load(session)
-                        print("[zine.topics] state updated")
-            except Exception as err:
-                print("[zine.topics] errror: %s" % (err))
-            await asyncio.sleep(self.period)