# HG changeset patch # User Marcin Kuzminski # Date 2017-10-24 08:50:57 # Node ID c4cc6e2a174bdf2022b9da8eaf66a2ce19bb38c1 # Parent be5818634ff4031e89a65279f76c6202334a4e2f audit-logger: use raw JSON with empty data to control unicode decode warnings. Passing in empty dict triggers warnings on sqlalchemy level that we're trying to pass in NON unicode into Unicode column. diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py --- a/rhodecode/lib/audit_logger.py +++ b/rhodecode/lib/audit_logger.py @@ -21,6 +21,7 @@ import logging import datetime +from rhodecode.lib.jsonalchemy import JsonRaw from rhodecode.model import meta from rhodecode.model.db import User, UserLog, Repository @@ -120,13 +121,13 @@ def _store_log(action_name, action_data, user_log.version = UserLog.VERSION_2 user_log.action = action_name - user_log.action_data = action_data + user_log.action_data = action_data or JsonRaw(u'{}') user_log.user_ip = ip_address user_log.user_id = user_id user_log.username = username - user_log.user_data = user_data + user_log.user_data = user_data or JsonRaw(u'{}') user_log.repository_id = repository_id user_log.repository_name = repository_name