Merge "Fix Python version for Travis CI tests"
diff --git a/aodh/files/logging.conf b/aodh/files/logging.conf
index 4c64288..440dd5e 100644
--- a/aodh/files/logging.conf
+++ b/aodh/files/logging.conf
@@ -42,7 +42,12 @@
{%- set ossyslog_args = values.logging.log_handlers.ossyslog.get('args', {}) -%}
[handler_ossyslog]
class = oslo_log.handlers.OSSysLogHandler
-args = ( handlers.SysLogHandler.{{ ossyslog_args.get('facility', 'LOG_USER') }}, )
+# the OSSysLogHandler uses 'syslog' lib, where the LOG_* facilities are already *8
+# but in the context where the args are evaluated we have access only to Python's
+# handlers.SysLogHandler.LOG_* constants that _ARE_NOT_ multiplied by 8.
+# To not have a completely magic single int in the rendered template,
+# we multiply it here.
+args = ( 8 * handlers.SysLogHandler.{{ ossyslog_args.get('facility', 'LOG_USER') }}, )
formatter = context
{%- endif %}
diff --git a/aodh/meta/fluentd.yml b/aodh/meta/fluentd.yml
index e5abc2a..2f77b72 100644
--- a/aodh/meta/fluentd.yml
+++ b/aodh/meta/fluentd.yml
@@ -43,8 +43,9 @@
value: INFO
- name: programname
value: aodh-wsgi
+ # Apache logs response time in microseconds
- name: http_response_time
- value: ${ record['http_response_time'].to_i/100000.to_f }
+ value: ${ record['http_response_time'].to_i/10**6.to_f }
match:
send_to_default:
tag: openstack.aodh