Merge branch 'release/2.0.1'

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,31 @@
+## Overview
+
+Brief description of what this PR does, and why it is needed.
+
+
+### Demo
+
+Optional. Screenshots, `curl` examples, etc.
+
+
+### Notes
+
+Optional. Ancillary topics, caveats, alternative strategies that didn't work out, anything else.
+
+
+## Testing Instructions
+
+ * How to test this PR
+ * Prefer bulleted description
+ * Start after checking out this branch
+ * Include any setup required, such as bundling scripts, restarting services, etc.
+ * Include test case, and expected output
+
+
+## Checklist
+- [ ] No gulp lint warnings
+- [ ] No python lint warnings
+- [ ] Python tests pass
+
+
+Connects #XXX

python/cac_tripplanner/cac_tripplanner/settings.py

@@ -14,6 +14,7 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 import yaml
+import logging.config
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 try:
@@ -164,6 +165,32 @@
 MEDIA_ROOT = '/media/cac/'
 MEDIA_URL = '/media/'
 
+# LOGGING CONFIGURATION
+LOGGING_CONFIG = None
+logging.config.dictConfig({
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'datefmt': '%Y-%m-%d %H:%M:%S %z',
+            'format': ('[%(asctime)s] [%(process)d] [%(levelname)s]'
+                       ' %(message)s'),
+        },
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+            'formatter': 'verbose',
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['console'],
+            'level': 'INFO',
+        }
+    }
+})
+
 # TEMPLATE CONFIGURATION
 # See https://docs.djangoproject.com/en/1.8/ref/settings/#templates
 TEMPLATES = [