From cefad649480bf8e06c2afec1e7e9296c47d6ffac Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 19 Mar 2011 19:24:14 -0400
Subject: [PATCH] Desperate attempt to fix amqp server, which is refusing to
 accept messages. (Actually, it acts like it does, then doesn't know where
 they went. UGH!)

---
 config/gitconfig.txt    | 28 ++++++++++++++++++++++++++++
 config/gunicorn_conf.py |  4 ++--
 fabfile.py              |  6 ++++++
 settings.py             |  4 +++-
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 config/gitconfig.txt

diff --git a/config/gitconfig.txt b/config/gitconfig.txt
new file mode 100644
index 000000000..22994f533
--- /dev/null
+++ b/config/gitconfig.txt
@@ -0,0 +1,28 @@
+[color]
+  ui = auto
+  branch = auto
+  diff = auto
+  status = auto
+[color "branch"]
+  current = green bold
+  local = green
+  remote = yellow
+[color "diff"]
+  meta = blue bold
+  frag = blue 
+  old = red bold
+  new = green bold
+[color "status"]
+  added = green
+  changed = yellow
+  untracked = blue bold
+[alias]
+  co = checkout
+  st = status
+  ci = commit
+  br = branch
+  df = diff
+  pl = pull
+  ps = push
+[branch]
+  autosetupmerge = true
diff --git a/config/gunicorn_conf.py b/config/gunicorn_conf.py
index 1a3015c65..7c7279c88 100644
--- a/config/gunicorn_conf.py
+++ b/config/gunicorn_conf.py
@@ -6,8 +6,8 @@ def numCPUs():
     return os.sysconf("SC_NPROCESSORS_ONLN")
 
 bind = "127.0.0.1:8000"
-pidfile = "/home/conesus/newsblur/logs/gunicorn.pid"
-logfile = "/home/conesus/newsblur/logs/production.log"
+pidfile = "/home/sclay/newsblur/logs/gunicorn.pid"
+logfile = "/home/sclay/newsblur/logs/production.log"
 loglevel = "debug"
 name = "newsblur"
 workers = numCPUs() * 2
diff --git a/fabfile.py b/fabfile.py
index a466ed231..1c7c09fbb 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -179,6 +179,7 @@ def setup_repo():
 def setup_local_files():
     put("config/toprc", "./.toprc")
     put("config/zshrc", "./.zshrc")
+    put('config/gitconfig.txt', './.gitconfig')
 
 def setup_libxml():
     sudo('apt-get -y install libxml2-dev libxslt1-dev python-lxml')
@@ -281,6 +282,11 @@ def setup_db_motd():
     put('config/motd_db.txt', '/etc/motd.tail', use_sudo=True)
     
 def setup_rabbitmq():
+    sudo('echo "deb http://www.rabbitmq.com/debian/ testing main" >> /etc/apt/sources.list')
+    run('wget http://www.rabbitmq.com/rabbitmq-signing-key-public.asc')
+    sudo('apt-key add rabbitmq-signing-key-public.asc')
+    run('rm rabbitmq-signing-key-public.asc')
+    sudo('apt-get update')
     sudo('apt-get install -y rabbitmq-server')
     sudo('rabbitmqctl add_user newsblur newsblur')
     sudo('rabbitmqctl add_vhost newsblurvhost')
diff --git a/settings.py b/settings.py
index 1b8ef8886..27b15dcc8 100644
--- a/settings.py
+++ b/settings.py
@@ -302,6 +302,7 @@ CELERY_QUEUES = {
     },
 }
 CELERY_DEFAULT_QUEUE = "update_feeds"
+BROKER_BACKEND = "amqplib"
 BROKER_HOST = "db01.newsblur.com"
 BROKER_PORT = 5672
 BROKER_USER = "newsblur"
@@ -314,8 +315,9 @@ CELERYD_LOG_LEVEL = 'ERROR'
 CELERY_IMPORTS = ("apps.rss_feeds.tasks", )
 CELERYD_CONCURRENCY = 4
 CELERY_IGNORE_RESULT = True
+CELERY_ACKS_LATE = True # Retry if task fails
 CELERYD_MAX_TASKS_PER_CHILD = 10
-#CELERYD_TASK_TIME_LIMIT = 12 * 30
+# CELERYD_TASK_TIME_LIMIT = 12 * 30
 CELERY_DISABLE_RATE_LIMITS = True
 
 # ====================