mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-04-13 09:42:01 +00:00
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!)
This commit is contained in:
parent
b5ea1dcdf6
commit
cefad64948
4 changed files with 39 additions and 3 deletions
28
config/gitconfig.txt
Normal file
28
config/gitconfig.txt
Normal file
|
@ -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
|
|
@ -6,8 +6,8 @@ def numCPUs():
|
||||||
return os.sysconf("SC_NPROCESSORS_ONLN")
|
return os.sysconf("SC_NPROCESSORS_ONLN")
|
||||||
|
|
||||||
bind = "127.0.0.1:8000"
|
bind = "127.0.0.1:8000"
|
||||||
pidfile = "/home/conesus/newsblur/logs/gunicorn.pid"
|
pidfile = "/home/sclay/newsblur/logs/gunicorn.pid"
|
||||||
logfile = "/home/conesus/newsblur/logs/production.log"
|
logfile = "/home/sclay/newsblur/logs/production.log"
|
||||||
loglevel = "debug"
|
loglevel = "debug"
|
||||||
name = "newsblur"
|
name = "newsblur"
|
||||||
workers = numCPUs() * 2
|
workers = numCPUs() * 2
|
||||||
|
|
6
fabfile.py
vendored
6
fabfile.py
vendored
|
@ -179,6 +179,7 @@ def setup_repo():
|
||||||
def setup_local_files():
|
def setup_local_files():
|
||||||
put("config/toprc", "./.toprc")
|
put("config/toprc", "./.toprc")
|
||||||
put("config/zshrc", "./.zshrc")
|
put("config/zshrc", "./.zshrc")
|
||||||
|
put('config/gitconfig.txt', './.gitconfig')
|
||||||
|
|
||||||
def setup_libxml():
|
def setup_libxml():
|
||||||
sudo('apt-get -y install libxml2-dev libxslt1-dev python-lxml')
|
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)
|
put('config/motd_db.txt', '/etc/motd.tail', use_sudo=True)
|
||||||
|
|
||||||
def setup_rabbitmq():
|
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('apt-get install -y rabbitmq-server')
|
||||||
sudo('rabbitmqctl add_user newsblur newsblur')
|
sudo('rabbitmqctl add_user newsblur newsblur')
|
||||||
sudo('rabbitmqctl add_vhost newsblurvhost')
|
sudo('rabbitmqctl add_vhost newsblurvhost')
|
||||||
|
|
|
@ -302,6 +302,7 @@ CELERY_QUEUES = {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
CELERY_DEFAULT_QUEUE = "update_feeds"
|
CELERY_DEFAULT_QUEUE = "update_feeds"
|
||||||
|
BROKER_BACKEND = "amqplib"
|
||||||
BROKER_HOST = "db01.newsblur.com"
|
BROKER_HOST = "db01.newsblur.com"
|
||||||
BROKER_PORT = 5672
|
BROKER_PORT = 5672
|
||||||
BROKER_USER = "newsblur"
|
BROKER_USER = "newsblur"
|
||||||
|
@ -314,6 +315,7 @@ CELERYD_LOG_LEVEL = 'ERROR'
|
||||||
CELERY_IMPORTS = ("apps.rss_feeds.tasks", )
|
CELERY_IMPORTS = ("apps.rss_feeds.tasks", )
|
||||||
CELERYD_CONCURRENCY = 4
|
CELERYD_CONCURRENCY = 4
|
||||||
CELERY_IGNORE_RESULT = True
|
CELERY_IGNORE_RESULT = True
|
||||||
|
CELERY_ACKS_LATE = True # Retry if task fails
|
||||||
CELERYD_MAX_TASKS_PER_CHILD = 10
|
CELERYD_MAX_TASKS_PER_CHILD = 10
|
||||||
# CELERYD_TASK_TIME_LIMIT = 12 * 30
|
# CELERYD_TASK_TIME_LIMIT = 12 * 30
|
||||||
CELERY_DISABLE_RATE_LIMITS = True
|
CELERY_DISABLE_RATE_LIMITS = True
|
||||||
|
|
Loading…
Add table
Reference in a new issue