提交: 76e8541ce0e07c18474db2bcd9a686da0a30ae5b - allura (git)

allura

Commit MetaInfo

• 修訂: 76e8541ce0e07c18474db2bcd9a686da0a30ae5b (tree)
• 時間: 2010-08-20 06:46:58
• 作者: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#765] - speed up ticket stats page so it doesn't time out, leading to an nginx 504 which is translated to a 500

Change Summary

• modified: Allura/allura/model/artifact.py
• modified: ForgeTracker/forgetracker/tracker_main.py

差異

--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -270,6 +270,7 @@ class Artifact(MappedClass):
     class __mongometa__:
         session = artifact_orm_session
         name='artifact'
+        indexes = [ 'app_config_id' ]
         def before_save(data):
             data['mod_date'] = datetime.utcnow()
             if c.project:
@@ -547,7 +548,7 @@ class Message(Artifact):
     class __mongometa__:
         session = artifact_orm_session
         name='message'
-        indexes = [ 'slug', 'parent_id' ]
+        indexes = Artifact.__mongometa__.indexes + [ 'slug', 'parent_id', 'timestamp' ]
     type_s='Generic Message'
 
     _id=FieldProperty(str, if_missing=h.gen_message_id)

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -26,7 +26,7 @@ from allura.lib.search import search_artifact
 from allura.lib.decorators import audit, react
 from allura.lib.security import require, has_artifact_access
 from allura.model import ProjectRole, TagEvent, UserTags, ArtifactReference, Feed, User
-from allura.model import Mailbox
+from allura.model import Mailbox, Post
 from allura.lib import widgets as w
 from allura.lib.widgets import form_fields as ffw
 from allura.lib.widgets.subscriptions import SubscribeForm
@@ -440,19 +440,11 @@ class RootController(BaseController):
         return count
 
     def ticket_comments_since(self, when=None):
-        count = 0
-        q = []
-        tickets = model.Ticket.query.find(dict(app_config_id=c.app.config._id))
-        if when:
-            for ticket in tickets:
-                posts = ticket.discussion_thread().find_posts(limit=None,
-                        style='linear', timestamp={'$gte':when})
-                count = count + len(posts)
-        else:
-            for ticket in tickets:
-                posts = ticket.discussion_thread().find_posts(limit=None, style='linear')
-                count = count + len(posts)
-        return count
+        q = dict(
+            discussion_id=c.app.config.discussion_id)
+        if when is not None:
+            q['timestamp'] = {'$gte':when}
+        return Post.query.find(q).count()
 
     @with_trailing_slash
     @expose('forgetracker.templates.stats')