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

Removed coloredlogs

Browse Source
This commit is contained in:
Ilan Steemers
2015-06-27 16:19:44 +02:00
parent d8020f0c0b
commit f82a3e75d6
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/core.py
+14 -21
View File
@@ -41,19 +41,10 @@ from .models import Task, Success, Schedule
logger = logging.getLogger('django-q') logger = logging.getLogger('django-q')
# Set up standard logging handler in case there is none
# Optional coloredlogs support
try:
import coloredlogs
coloredlogs.install(level=getattr(logging, LOG_LEVEL))
except ImportError:
coloredlogs = None
# Set up standard logging handler
if not logger.handlers: if not logger.handlers:
logger.setLevel(level=getattr(logging, LOG_LEVEL)) logger.setLevel(level=getattr(logging, LOG_LEVEL))
formatter = logging.Formatter(fmt='%(asctime)s [django_q] %(message)s', formatter = logging.Formatter(fmt='%(asctime)s [Q] %(levelname)s %(message)s',
datefmt='%H:%M:%S') datefmt='%H:%M:%S')
handler = logging.StreamHandler() handler = logging.StreamHandler()
handler.setFormatter(formatter) handler.setFormatter(formatter)
@@ -326,7 +317,6 @@ def worker(task_queue, done_queue):
m = importlib.import_module(module) m = importlib.import_module(module)
f = getattr(m, func) f = getattr(m, func)
except (ValueError, ImportError, AttributeError) as e: except (ValueError, ImportError, AttributeError) as e:
logger.error(e)
return_pack(e, False) return_pack(e, False)
continue continue
# execute the payload # execute the payload
@@ -344,15 +334,18 @@ def save_task(task):
""" """
if task['success'] and 0 < SAVE_LIMIT < Success.objects.count(): if task['success'] and 0 < SAVE_LIMIT < Success.objects.count():
Success.objects.first().delete() Success.objects.first().delete()
Task.objects.create(name=task['name'], try:
func=task['func'], Task.objects.create(name=task['name'],
hook=task['hook'], func=task['func'],
args=task['args'], hook=task['hook'],
kwargs=task['kwargs'], args=task['args'],
started=task['started'], kwargs=task['kwargs'],
stopped=task['stopped'], started=task['started'],
result=task['result'], stopped=task['stopped'],
success=task['success']) result=task['result'],
success=task['success'])
except Exception as e:
logger.exception(e)
def async(func, *args, **kwargs): def async(func, *args, **kwargs):