Changes on server

- bugfixes in gcal callback
- requirements txt
This commit is contained in:
Martin Bauer
2014-04-21 09:21:59 +02:00
parent aac687c0c7
commit 46b4078fac
9 changed files with 84 additions and 56 deletions

View File

@@ -79,7 +79,7 @@ STATIC_ROOT = PROJECT_PATH + '/static_collection'
STATIC_URL = '/static/'
LOGIN_URL="/musicians/login"
PUBLIC_URLS=( "^musicians/login/?$", "^musicians/login/usernames/?$")
PUBLIC_URLS=( "^musicians/login/?$", "^musicians/login/usernames/?$", "^eventplanner_gcal/gcalApiCallback*")
# Additional locations of static files
STATICFILES_DIRS = (
@@ -195,49 +195,29 @@ CRISPY_TEMPLATE_PACK = 'bootstrap'
# the site admins on every HTTP 500 error when DEBUG=False.
# See http://docs.djangoproject.com/en/dev/topics/logging for
# more details on how to customize your logging configuration.
LOGGING = {
'version': 1,
'disable_existing_loggers': True,
'formatters': {
'standard': {
'format' : "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s",
'datefmt' : "%d/%b/%Y %H:%M:%S"
},
},
'disable_existing_loggers': False,
'handlers': {
'null': {
'level':'DEBUG',
'class':'django.utils.log.NullHandler',
},
'logfile': {
'level':'DEBUG',
'class':'logging.handlers.RotatingFileHandler',
'filename': PROJECT_PATH + "/logfile",
'maxBytes': 50000,
'backupCount': 2,
'formatter': 'standard',
},
'console':{
'level':'INFO',
'class':'logging.StreamHandler',
'formatter': 'standard'
'file': {
'level': 'DEBUG',
'class': 'logging.FileHandler',
'filename': '/srv/test/eventplanner.log',
},
},
'loggers': {
'django': {
'handlers':['console'],
'eventplanner_gcal': {
'handlers': ['file'],
'level': 'DEBUG',
'propagate': True,
'level':'WARN',
},
'django.db.backends': {
'handlers': ['console'],
'eventplanner': {
'handler': ['file'],
'level': 'DEBUG',
'propagate': False,
},
'musicians': {
'handlers': ['console', 'logfile'],
'level': 'DEBUG',
},
}
'propagate': True,
}
},
}