Merge pull request #4538 from AlanCoding/celery_log_reset

Celery log reset on CTiT change / task start
This commit is contained in:
Alan Rominger
2017-01-06 15:36:45 -05:00
committed by GitHub
7 changed files with 80 additions and 31 deletions

View File

@@ -376,6 +376,7 @@ CELERY_ACCEPT_CONTENT = ['json']
CELERY_TRACK_STARTED = True
CELERYD_TASK_TIME_LIMIT = None
CELERYD_TASK_SOFT_TIME_LIMIT = None
CELERYD_POOL_RESTARTS = True
CELERYBEAT_SCHEDULER = 'celery.beat.PersistentScheduler'
CELERYBEAT_MAX_LOOP_INTERVAL = 60
CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend'
@@ -878,7 +879,7 @@ LOGGING = {
},
'http_receiver': {
'class': 'awx.main.utils.handlers.HTTPSNullHandler',
'level': 'INFO',
'level': 'DEBUG',
'formatter': 'json',
'host': '',
},
@@ -977,7 +978,7 @@ LOGGING = {
'handlers': ['callback_receiver'],
},
'awx.main.tasks': {
'handlers': ['task_system']
'handlers': ['task_system'],
},
'awx.main.scheduler': {
'handlers': ['task_system'],
@@ -1005,18 +1006,6 @@ LOGGING = {
'level': 'INFO',
'propagate': False
},
'awx.analytics.job_events': {
'handlers': ['null'],
'level': 'INFO'
},
'awx.analytics.activity_stream': {
'handlers': ['null'],
'level': 'INFO'
},
'awx.analytics.system_tracking': {
'handlers': ['null'],
'level': 'INFO'
},
'django_auth_ldap': {
'handlers': ['console', 'file', 'tower_warnings'],
'level': 'DEBUG',