Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pip-requires.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ xlrd==0.9.2
xlutils==1.6.0
xlwt==0.7.5
requests==2.0.1
raven==4.0.2
124 changes: 0 additions & 124 deletions ureport_project/celeryconfig.py

This file was deleted.

12 changes: 6 additions & 6 deletions ureport_project/ci_settings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from settings import *
from settings.base import *
CELERY_ALWAYS_EAGER = True
ADMIN_UNREGISTER = True
IBM_TABLES_MANAGED = True
Expand Down Expand Up @@ -106,29 +106,29 @@
'handlers': ['application_log_file'],
'level': 'ERROR',
'propagate': True,

},

'app/ureport' : {
'handlers': ['application_log_file'],
'level': 'INFO',
'propagate': True,

},

'app/ureport' : {
'handlers': ['application_log_file'],
'level': 'INFO',
'propagate': True,

},

'django.middleware': {
'handlers': ['application_log_file'],
'level': 'ERROR',
'propagate': True,
},

'django.db.backends': {
'handlers': ['application_log_file'],
'level': 'ERROR',
Expand All @@ -145,7 +145,7 @@
'level': 'INFO',
'propagate': True,
},

'ureport.tasks': {
'handlers': ['application_log_file'],
'level': 'INFO',
Expand Down
18 changes: 14 additions & 4 deletions ureport_project/manage.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
#!/usr/bin/env python
# vim: ai ts=4 sts=4 et sw=4 encoding=utf-8
import os
import sys

from django.core.management import execute_manager
import settings
if __name__ == "__main__":
execute_manager(settings)
"""
you can add something like this here:
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.production")

but its better to set the environment variable with a deploy script

and just pass --settings=settings.dev to manage.py when running locally
"""

from django.core.management import execute_from_command_line

execute_from_command_line(sys.argv)
Loading