Change the settings default to work with the two scoops split settings.

Also configure logging to work with django 1.7

diff --git a/encode_submission/encode3.py b/encode_submission/encode3.py
index cb4bbce36ba63b42bb7f3117efac6bf4b1a976de..921988a700bcb6be16f68dc5d5ed2e14849e6870 100644 (file)
--- a/encode_submission/encode3.py
+++ b/encode_submission/encode3.py
@@ -24,9 +24,6 @@ from zipfile import ZipFile
 
 import RDF
 
-if not 'DJANGO_SETTINGS_MODULE' in os.environ:
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'htsworkflow.settings'
-
 from htsworkflow.util import api
 from htsworkflow.util.rdfhelp import \
     dafTermOntology, \
@@ -46,18 +43,21 @@ logger = logging.getLogger(__name__)
 
 INDENTED = "  " + os.linesep
 
+import django
+if not 'DJANGO_SETTINGS_MODULE' in os.environ:
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'htsworkflow.settings.local'
 
 def main(cmdline=None):
     parser = make_parser()
     opts, args = parser.parse_args(cmdline)
     submission_uri = None
 
+    from django.conf import settings
+
     if opts.debug:
-        logging.basicConfig(level=logging.DEBUG)
+        settings.LOGGING['loggers']['level'] = 'DEBUG'
     elif opts.verbose:
-        logging.basicConfig(level=logging.INFO)
-    else:
-        logging.basicConfig(level=logging.WARNING)
+        settings.LOGGING['loggers']['level'] = 'INFO'
 
     apidata = api.make_auth_from_opts(opts, parser)
 
@@ -207,4 +207,6 @@ def make_parser():
     return parser
 
 if __name__ == "__main__":
+    django.setup()
+
     main()

diff --git a/htsworkflow/settings/local.py b/htsworkflow/settings/local.py
index dd5c3f7033c25b2f8776646c32d2d41b178ffed8..f3e2e83f313646ee7dd603849c759e53055f94cf 100644 (file)
--- a/htsworkflow/settings/local.py
+++ b/htsworkflow/settings/local.py
@@ -20,7 +20,7 @@ LOGGING = {
     'loggers': {
         'htsworkflow': {
             'handlers': ['console'],
-            'level': 'ERROR',
+            'level': 'WARNING',
         }
     }
 }