Merge pull request #338 from HXLStandard/dev

Dev into master for 1.21.1
HXLStandard · Aug 6, 2020 · 1b9fc10 · 1b9fc10
2 parents a4caadb + 74f071a
commit 1b9fc10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2020-08-06 Release 1.21.1
+	- restored default Flask logging to stdout/stderr
+
 2020-07-23 Release 1.21
 	- added a new "Logs" tab to show logs from HXL processing
 	- added UI support for Expand lists filter

diff --git a/hxl_proxy/__init__.py b/hxl_proxy/__init__.py
@@ -7,7 +7,7 @@
 Documentation: http://hxlstandard.org
 """
 
-import logging, os
+import os
 
 import requests_cache
 from flask import Flask, g, request
@@ -16,17 +16,14 @@
 import werkzeug.datastructures
 from . import reverse_proxied
 
-__version__="1.21"
+__version__="1.21.1"
 """Module version number
 See https://www.python.org/dev/peps/pep-0396/
 """
 
 # Main application object
 app = Flask(__name__)
 
-# Disable default logging (we'll add any log handlers explicitly in deployment)
-app.logger.addHandler(logging.NullHandler())
-
 # Handle subpaths
 app.wsgi_app = reverse_proxied.ReverseProxied(app.wsgi_app)
 

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
     name = 'hxl-proxy',
     packages = ['hxl_proxy'],
     package_data={'hxl_proxy': ['*.sql']},
-    version = "1.21",
+    version = "1.21.1",
     description = 'Flask-based web proxy for HXL',
     long_description=long_description,
     long_description_content_type="text/markdown",