From 4da9f70b39269e309d249c5bf44d2ff34cc16aa6 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 30 Mar 2016 10:46:33 -0400 Subject: [PATCH] Fix fluent query log serialization when datetime types are in use. Currently queries which have raw datetime.datetime objects in the context will fail to log and throw an exception. --- lib/galaxy/util/log/fluent_log.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/util/log/fluent_log.py b/lib/galaxy/util/log/fluent_log.py index 8e0752e9808..139c9c456f8 100644 --- a/lib/galaxy/util/log/fluent_log.py +++ b/lib/galaxy/util/log/fluent_log.py @@ -2,6 +2,7 @@ Provides a `TraceLogger` implementation that logs to a fluentd collector """ +import json import threading import time @@ -41,4 +42,4 @@ class FluentTraceLogger( object ): kwargs.update( self.thread_local.context ) self.lock.release() event_time = event_time or time.time() - self.sender.emit_with_time( label, int(event_time), kwargs ) + self.sender.emit_with_time( label, int(event_time), json.dumps(kwargs, default=str))