Merge branch 'master' into quart-framework-support

bobbui · web-flow · commit 99d74171da0a · 2018-10-16T22:40:46.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ## [Unreleased]
  - Introduced sap namespace
 
+## 0.0.2 - 2017-12-24
 
-## 1.0.0 - 2017-12-24
+### Changed
+- fixed https://github.com/thangbn/json-logging-python/pull/2 
+
+## 0.0.1 - 2017-12-24
 
 ### Changed
 - Initial release
diff --git a/README.md b/README.md
@@ -301,7 +301,9 @@ https://docs.python.org/2/library/logging.html#logging.Logger.propagate
 ## [3] more on flask use_reloader
 http://flask.pocoo.org/docs/0.12/errorhandling/#working-with-debuggers
 
-# Development
+# Development 
+create file **.pypirc**
+
 ```
 [distutils]
 index-servers =
@@ -320,12 +322,20 @@ password=
 ```
 pypitest
 ```
+python setup.py bdist_wheel
+twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+python -m pip install --index-url https://test.pypi.org/simple/ json_logging
+
+
 python setup.py sdist upload -r pypitest
 python setup.py bdist_wheel --universal upload -r pypitest
 pip3 install json_logging --index-url https://test.pypi.org/simple/
 ```
 pypi
 ```
+twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
+
+
 python setup.py sdist upload -r pypi
 python3 setup.py bdist_wheel --universal upload -r pypi
 pip3 install json_logging
diff --git a/json_logging/__init__.py b/json_logging/__init__.py
@@ -236,6 +236,7 @@ def format(self, record):
                            "logger": record.name,
                            "thread": record.threadName,
                            "level": record.levelname,
+                           "module": record.module,
                            "line_no": record.lineno,
                            "msg": record.getMessage()
                            }
@@ -262,6 +263,7 @@ def format(self, record):
                            "logger": record.name,
                            "thread": record.threadName,
                            "level": record.levelname,
+                           "module": record.module,
                            "line_no": record.lineno,
                            "correlation_id": _request_util.get_correlation_id(),
                            "msg": record.getMessage()
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name="json-logging",
-    version='0.0.7',
+    version='0.0.9',
     packages=find_packages(exclude=['contrib', 'docs', 'tests*', 'example', 'dist', 'build']),
     license='Apache License 2.0',
     description="JSON Python Logging",
