fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-05 13:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue with rollbar configuration

Browse Source
This commit is contained in:
Ilan Steemers
2016-01-27 10:32:48 +01:00
parent ddb8f8117f
commit 8298f2319f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/conf.py
+5 -4
View File
@@ -1,4 +1,5 @@
import logging import logging
from copy import deepcopy
from signal import signal from signal import signal
from multiprocessing import cpu_count, Queue from multiprocessing import cpu_count, Queue
@@ -50,6 +51,9 @@ class Conf(object):
# ORM broker # ORM broker
ORM = conf.get('orm', None) ORM = conf.get('orm', None)
# Custom broker
BROKER = conf.get('broker', None)
# Database Poll # Database Poll
POLL = conf.get('poll', 0.2) POLL = conf.get('poll', 0.2)
@@ -169,7 +173,7 @@ if not logger.handlers:
# rollbar # rollbar
if Conf.ROLLBAR: if Conf.ROLLBAR:
rollbar_conf = Conf.ROLLBAR rollbar_conf = deepcopy(Conf.ROLLBAR)
try: try:
import rollbar import rollbar
rollbar.init(rollbar_conf.pop('access_token'), environment=rollbar_conf.pop('environment'), **rollbar_conf) rollbar.init(rollbar_conf.pop('access_token'), environment=rollbar_conf.pop('environment'), **rollbar_conf)
@@ -180,9 +184,6 @@ else:
rollbar = None rollbar = None
# get parent pid compatibility # get parent pid compatibility
def get_ppid(): def get_ppid():
if hasattr(os, 'getppid'): if hasattr(os, 'getppid'):