Merge branch 'master' of github.com:kylewm/woodwind

fabfile.py

@@ -32,7 +32,6 @@ def restart():
         with prefix("source venv/bin/activate"):
             run("pip install --upgrade -r requirements.txt")
     sudo("restart woodwind")
-    sudo("restart woodwind-celery")
     sudo("restart woodwind-tornado")
 
 

timers.py

@@ -0,0 +1,7 @@
+from uwsgidecorators import timer
+from woodwind import tasks
+
+
+@timer(300)
+def tick(signum=None):
+    tasks.q.enqueue(tasks.tick)

woodwind.ini

@@ -5,5 +5,5 @@ threads=4
 socket=/tmp/woodwind.sock
 chmod-socket=666
 module=woodwind.wsgi
-attach-daemon=rqworker
+import=timers
-import=woodwind.tasks
+attach-daemon=venv/bin/rqworker

woodwind/tasks.py

@@ -1,7 +1,6 @@
 from config import Config
 from contextlib import contextmanager
 from redis import StrictRedis
-from uwsgidecorators import timer
 from woodwind.models import Feed, Entry
 import bs4
 import datetime
@@ -45,8 +44,7 @@ def session_scope():
         session.close()
 
 
-@timer(300)
+def tick():
-def tick(signum=None):
     """Checks all feeds to see if any of them are ready for an update.
     Makes use of uWSGI timers to run every 5 minutes, without needing
     a separate process to fire ticks.

woodwind/templates/_entry.jinja2

@@ -46,17 +46,14 @@
     </div>
   {% endif %}
 
-  {% if entry._syndicated_copies %}
-    <div>
-      Also on
-      {% for copy in entry._syndicated_copies %}
-        {{ copy.permalink | domain_for_url }}
-      {% endfor %}
-    </div>
-  {% endif %}
 
   <footer>
     <a href="{{ entry.permalink }}">{{ entry.published | relative_time }}</a>
+
+  {% if entry._syndicated_copies %}
+    (also on{% for copy in entry._syndicated_copies %} <a href="{{ copy.permalink }}">{{ copy.permalink | domain_for_url }}</a>{% endfor %})
+  {% endif %}
+
     <div class="reply-area">
       {% include '_reply.jinja2' with context %}
     </div>