From: JINMEI Tatuya Date: Fri, 23 Dec 2011 04:16:29 +0000 (-0800) Subject: [1502] fixed log parameters for LIBXFRIN_DIFFERENT_TTL. this will solve #1471. X-Git-Tag: trac2351_base~310^2~12^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=760720cb251366fe37bae4a06ce6e0e45ae02a33;p=thirdparty%2Fkea.git [1502] fixed log parameters for LIBXFRIN_DIFFERENT_TTL. this will solve #1471. --- diff --git a/src/lib/python/isc/xfrin/diff.py b/src/lib/python/isc/xfrin/diff.py index ffa5a3c0f5..f9f5d510e4 100644 --- a/src/lib/python/isc/xfrin/diff.py +++ b/src/lib/python/isc/xfrin/diff.py @@ -188,7 +188,8 @@ class Diff: rrset.get_ttl()))) if rrset.get_ttl() != buf[-1][1].get_ttl(): logger.warn(LIBXFRIN_DIFFERENT_TTL, rrset.get_ttl(), - buf[-1][1].get_ttl()) + buf[-1][1].get_ttl(), rrset.get_name(), + rrset.get_class(), rrset.get_type()) for rdatum in rrset.get_rdata(): buf[-1][1].add_rdata(rdatum) self.__buffer = buf diff --git a/src/lib/python/isc/xfrin/libxfrin_messages.mes b/src/lib/python/isc/xfrin/libxfrin_messages.mes index 203e31fa44..b948e022e3 100644 --- a/src/lib/python/isc/xfrin/libxfrin_messages.mes +++ b/src/lib/python/isc/xfrin/libxfrin_messages.mes @@ -15,10 +15,10 @@ # No namespace declaration - these constants go in the global namespace # of the libxfrin_messages python module. -% LIBXFRIN_DIFFERENT_TTL multiple data with different TTLs (%1, %2) on %3/%4. Adjusting %2 -> %1. +% LIBXFRIN_DIFFERENT_TTL multiple data with different TTLs (%1, %2) on %3/%4/%5. Adjusting %2 -> %1. The xfrin module received an update containing multiple rdata changes for the same RRset. But the TTLs of these don't match each other. As we combine them -together, the later one get's overwritten to the earlier one in the sequence. +together, the latter one gets overwritten to the earlier one in the sequence. % LIBXFRIN_NO_JOURNAL disabled journaling for updates to %1 on %2 An attempt was made to create a Diff object with journaling enabled, but