diff options
| author | root <root@viserion.(none)> | 2013-06-11 16:26:01 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-06-11 16:26:01 +0000 |
| commit | f918fbc88f1e43e79ce8ab5c2ea96cf45e6719e1 (patch) | |
| tree | 15e04c15041d7a04a810b7d30fbe1ccfd4559fa9 /example_project | |
| parent | 506151a93eaa0733f2ce0ea41cd4999089ba734d (diff) | |
| parent | a1b49aeac0c932c54b06670ee2b35ea946d84f32 (diff) | |
| download | Ishtar-f918fbc88f1e43e79ce8ab5c2ea96cf45e6719e1.tar.bz2 Ishtar-f918fbc88f1e43e79ce8ab5c2ea96cf45e6719e1.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'example_project')
| -rw-r--r-- | example_project/local_settings_nantes.py | 2 | ||||
| -rw-r--r-- | example_project/settings.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/example_project/local_settings_nantes.py b/example_project/local_settings_nantes.py index ac839e00d..b0d4411f4 100644 --- a/example_project/local_settings_nantes.py +++ b/example_project/local_settings_nantes.py @@ -122,7 +122,7 @@ ISHTAR_OPE_COL_FORMAT = [ None, # pass None, # pass None, # pass - [('code_dracar',), 'parse_string'], + [('code_dracar',), 'parse_string_10'], None, # pass (('in_charge',), 'parse_name_surname'), None, # organisation - valeur par défaut si pas precise en colonne "V" diff --git a/example_project/settings.py b/example_project/settings.py index bb7a59d74..0aaeb306d 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -4,6 +4,8 @@ import os +SQL_DEBUG = False + ROOT_PATH = os.path.abspath(os.path.curdir) + os.path.sep STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' @@ -125,6 +127,10 @@ LOGGING = {'version': 1, 'class': 'logging.handlers.WatchedFileHandler', 'filename': '/var/log/django/ishtar.log' }, + 'console':{ + 'level': 'DEBUG', + 'class': 'logging.StreamHandler', + }, }, 'loggers': { # Again, default Django configuration to email unhandled exceptions @@ -197,3 +203,9 @@ import sys if 'test' in sys.argv or 'test_coverage' in sys.argv: DATABASES['default']['engine'] = 'sqlite3' + +if SQL_DEBUG: + LOGGING['loggers']['django.db.backends'] = { + 'level': 'DEBUG', + 'handlers': ['console'], + } |