Parcourir la source

[1371] updated logging and comment

JINMEI Tatuya il y a 13 ans
Parent
commit
bea7b0e3fd
2 fichiers modifiés avec 12 ajouts et 1 suppressions
  1. 4 1
      src/bin/xfrout/xfrout.py.in
  2. 8 0
      src/bin/xfrout/xfrout_messages.mes

+ 4 - 1
src/bin/xfrout/xfrout.py.in

@@ -414,9 +414,12 @@ class XfroutSession():
             # iteration in response generation
             # iteration in response generation
             self._iterator = None
             self._iterator = None
             self._jnl_reader = None
             self._jnl_reader = None
-            # Log it.
+            logger.info(XFROUT_IXFR_UPTODATE, format_addrinfo(self._remote),
+                        format_zone_str(zone_name, zone_class),
+                        begin_serial, end_serial)
             return Rcode.NOERROR()
             return Rcode.NOERROR()
 
 
+        # Set up the journal reader or fall back to AXFR-style IXFR
         try:
         try:
             code, self._jnl_reader = self._datasrc_client.get_journal_reader(
             code, self._jnl_reader = self._datasrc_client.get_journal_reader(
                 zone_name, begin_serial, end_serial)
                 zone_name, begin_serial, end_serial)

+ 8 - 0
src/bin/xfrout/xfrout_messages.mes

@@ -192,6 +192,14 @@ An IXFR request was received but the underlying data source did
 not support journaling.  The xfrout daemon fell back to AXFR-style
 not support journaling.  The xfrout daemon fell back to AXFR-style
 IXFR.
 IXFR.
 
 
+% XFROUT_IXFR_UPTODATE IXFR client %1, %2: client version is new enough (ours=%3, theirs=%4)
+An IXFR request was received, but the client's SOA version is the same as
+or newer than that of the server.  The xfrout server responds to the
+request with the answer section being just one SOA of that version.
+Note: as of this wrting the 'newer version' cannot be identified due to
+the lack of support for the serial number arithmetic.  This will soon
+be implemented.
+
 % XFROUT_IXFR_NO_VERSION IXFR client %1, %2: version (%3 to %4) not in journal, falling back to AXFR
 % XFROUT_IXFR_NO_VERSION IXFR client %1, %2: version (%3 to %4) not in journal, falling back to AXFR
 An IXFR request was received, but the requested range of differences
 An IXFR request was received, but the requested range of differences
 were not found in the data source.  The xfrout daemon fell back to
 were not found in the data source.  The xfrout daemon fell back to