From 7a41b6a949b1a8c20c4f966ad7e87f3a0bbe65c8 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 3 Apr 2013 18:11:23 -0700
Subject: [PATCH] Using proper hostname for task server. Adding verbosity to
 feed fetching.

---
 apps/rss_feeds/models.py |  8 +++++++-
 fabfile.py               | 10 ++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index f74674bbe..fa087df26 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -808,7 +808,7 @@ class Feed(models.Model):
     def add_update_stories(self, stories, existing_stories, verbose=False):
         ret_values = dict(new=0, updated=0, same=0, error=0)
 
-        if settings.DEBUG:
+        if settings.DEBUG or verbose:
             logging.debug("   ---> [%-30s] ~FBChecking ~SB%s~SN new/updated against ~SB%s~SN stories" % (
                           self.title[:30],
                           len(stories),
@@ -913,6 +913,12 @@ class Feed(models.Model):
                 ret_values['same'] += 1
                 # logging.debug("Unchanged story: %s " % story.get('title'))
         
+        if settings.DEBUG or verbose:
+            logging.debug("   ---> [%-30s] ~FBChecked ~SB%s~SN new/updated: %s" % (
+                          self.title[:30],
+                          len(stories),
+                          ret_values))
+
         return ret_values
     
     def update_read_stories_with_new_guid(self, old_story_guid, new_story_guid):
diff --git a/fabfile.py b/fabfile.py
index 9af8a945b..6732b2359 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -729,7 +729,7 @@ def downgrade_pil():
 # = Setup - DB =
 # ==============    
 
-# @parallel
+@parallel
 def setup_db_firewall():
     ports = [
         5432,   # PostgreSQL
@@ -749,8 +749,7 @@ def setup_db_firewall():
                   env.roledefs['dbdo'] + 
                   env.roledefs['dev'] + 
                   env.roledefs['debug'] + 
-                  env.roledefs['task'] + 
-                  ['199.15.249.101']):
+                  env.roledefs['task']):
         sudo('ufw allow proto tcp from %s to any port %s' % (
             ip,
             ','.join(map(str, ports))
@@ -948,7 +947,10 @@ def enable_celery_supervisor(queue=None):
 
 @parallel
 def copy_task_settings():
-    if env.host:
+    server_hostname = run('hostname')
+    if 'task' in server_hostname:
+        host = server_hostname
+    elif env.host:
         host = env.host.split('.', 2)[0]
     else:
         host = env.host_string.split('.', 2)[0]