From 2b514771564024df2fb89e5b4351eef903f9947d Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Mon, 5 Jul 2010 23:44:23 +0000 Subject: DBStats: Improved handling of binary objects in the database git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5962 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/DBStats.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/lib/Server/Plugins') diff --git a/src/lib/Server/Plugins/DBStats.py b/src/lib/Server/Plugins/DBStats.py index 1b8052c2d..d6d6d7819 100644 --- a/src/lib/Server/Plugins/DBStats.py +++ b/src/lib/Server/Plugins/DBStats.py @@ -1,3 +1,4 @@ +import binascii import difflib import logging import lxml.etree @@ -83,8 +84,14 @@ class DBStats(Bcfg2.Server.Plugin.Plugin, ret.append(getattr(entry.reason, "current_%s" % t)) if entry.reason.current_diff != '': - ret.append('\n'.join(difflib.restore(\ - entry.reason.current_diff.split('\n'), 1))) + if entry.reason.is_binary: + ret.append(binascii.a2b_base64(entry.reason.current_diff)) + else: + ret.append('\n'.join(difflib.restore(\ + entry.reason.current_diff.split('\n'), 1))) + elif entry.reason.is_binary: + # If len is zero the object was too large to store + raise Bcfg2.Server.Plugin.PluginExecutionError else: ret.append(None) return ret -- cgit v1.2.3-1-g7c22