Commit 0ba8bbab authored by Shane Kerr's avatar Shane Kerr
Browse files

Merge branch 'trac3099'

parents cb81101a caeaa601
......@@ -727,8 +727,9 @@ class XfrinConnection(asyncore.dispatcher):
self.connect(self._master_addrinfo[2])
return True
except socket.error as e:
logger.error(XFRIN_CONNECT_MASTER, self.tsig_key_name,
logger.error(XFRIN_CONNECT_MASTER,
self._master_addrinfo[2],
self._zone_name.to_text(),
str(e))
return False
......
......@@ -56,9 +56,9 @@ most likely cause is that xfrin the msgq daemon is not running.
There was an error while the given command was being processed. The
error is given in the log message.
% XFRIN_CONNECT_MASTER (with TSIG %1) error connecting to master at %2: %3
There was an error opening a connection to the master. The error is
shown in the log message.
% XFRIN_CONNECT_MASTER error connecting to master at %1 for %2: %3
There was an error opening a connection to the master for the specified
zone. The error is shown in the log message.
% XFRIN_DATASRC_CONFIG_ERROR failed to update data source configuration: %1
Configuration for the global data sources is updated, but the update
......
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