Commit 760720cb authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[1502] fixed log parameters for LIBXFRIN_DIFFERENT_TTL. this will solve #1471.

parent cc48c3a8
...@@ -188,7 +188,8 @@ class Diff: ...@@ -188,7 +188,8 @@ class Diff:
rrset.get_ttl()))) rrset.get_ttl())))
if rrset.get_ttl() != buf[-1][1].get_ttl(): if rrset.get_ttl() != buf[-1][1].get_ttl():
logger.warn(LIBXFRIN_DIFFERENT_TTL, rrset.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(): for rdatum in rrset.get_rdata():
buf[-1][1].add_rdata(rdatum) buf[-1][1].add_rdata(rdatum)
self.__buffer = buf self.__buffer = buf
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
# No namespace declaration - these constants go in the global namespace # No namespace declaration - these constants go in the global namespace
# of the libxfrin_messages python module. # 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 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 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 % LIBXFRIN_NO_JOURNAL disabled journaling for updates to %1 on %2
An attempt was made to create a Diff object with journaling enabled, but An attempt was made to create a Diff object with journaling enabled, but
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment