Skip to content

Commit

Permalink
Merge pull request #3 from propylon/master
Browse files Browse the repository at this point in the history
Cherry-pick new changes
  • Loading branch information
nalch authored Dec 2, 2019
2 parents 154f7ee + 77c7078 commit bdb5112
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import os
import datetime

from herodotus.describe import rpm
import sphinx_rtd_theme

# If extensions (or modules to document with autodoc) are in another directory,
Expand Down Expand Up @@ -236,7 +235,7 @@
#latex_show_urls = False

# Documents to append as an appendix to all manuals.
latex_appendices = ['topics/glossary',]
# latex_appendices = ['topics/glossary',]

# If false, no module index is generated.
#latex_domain_indices = True
Expand Down
2 changes: 1 addition & 1 deletion src/logging_endpoint/message_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def json_handler(log_data):
msg = '-'.join(filter(None, (
log_data.get('timestamp', ''),
logger,
log_data.get('message', None)
str(log_data.get('message', None))
)))
args = tuple()
kwargs = dict()
Expand Down

0 comments on commit bdb5112

Please sign in to comment.