From: Kazunori Fujiwara Date: Fri, 10 Aug 2012 09:18:19 +0000 (+0900) Subject: [2138] Removed unused messages and a member function X-Git-Tag: trac2351_base~131 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cd1c7285c20f84b14bc2bb5ae1435c6e6bd1e5e;p=thirdparty%2Fkea.git [2138] Removed unused messages and a member function --- diff --git a/src/bin/auth/auth_messages.mes b/src/bin/auth/auth_messages.mes index e964b05ae3..7209cb60ac 100644 --- a/src/bin/auth/auth_messages.mes +++ b/src/bin/auth/auth_messages.mes @@ -122,11 +122,6 @@ a NOTIFY packet that an RR type of something other than SOA in the question section. (The RR type received is included in the message.) The server will return a FORMERR error to the sender. -% AUTH_NO_STATS_SESSION session interface for statistics is not available -The authoritative server had no session with the statistics module at the -time it attempted to send it data: the attempt has been abandoned. This -could be an error in configuration. - % AUTH_NO_XFRIN received NOTIFY but XFRIN session is not running This is a debug message produced by the authoritative server when it receives a NOTIFY packet but the XFRIN process is not running. The packet will be @@ -169,11 +164,9 @@ a command on the command channel. % AUTH_RECEIVED_NOTIFY received incoming NOTIFY for zone name %1, zone class %2 This is a debug message reporting that an incoming NOTIFY was received. -% AUTH_RECEIVED_SENDSTATS command 'sendstats' received +% AUTH_RECEIVED_GETSTATS command 'getstats' received This is a debug message issued when the authoritative server has received -a command from the statistics module to send it data. The 'sendstats' -command is handled differently to other commands, which is why the debug -message associated with it has its own code. +a command from the statistics module to send it data. % AUTH_RESPONSE_FAILURE exception while building response to query: %1 This is a debug message, generated by the authoritative server when an @@ -242,37 +235,6 @@ is not running, b10-auth will respond to UPDATE requests with rcode NOTIMP. When b10-ddns is running, b10-ddns will handle and respond to the UPDATE message. -% AUTH_STATS_CHANNEL_CREATED STATS session channel created -This is a debug message indicating that the authoritative server has -created a channel to the statistics process. It is issued during server -startup is an indication that the initialization is proceeding normally. - -% AUTH_STATS_CHANNEL_ESTABLISHED STATS session channel established -This is a debug message indicating that the authoritative server -has established communication over the previously created statistics -channel. It is issued during server startup is an indication that the -initialization is proceeding normally. - -% AUTH_STATS_COMMS communication error in sending statistics data: %1 -An error was encountered when the authoritative server tried to send data -to the statistics daemon. The message includes additional information -describing the reason for the failure. - -% AUTH_STATS_TIMEOUT timeout while sending statistics data: %1 -The authoritative server sent data to the statistics daemon but received -no acknowledgement within the specified time. The message includes -additional information describing the reason for the failure. - -% AUTH_STATS_TIMER_DISABLED statistics timer has been disabled -This is a debug message indicating that the statistics timer has been -disabled in the authoritative server and no statistics information is -being produced. - -% AUTH_STATS_TIMER_SET statistics timer set to %1 second(s) -This is a debug message indicating that the statistics timer has been -enabled and that the authoritative server will produce statistics data -at the specified interval. - % AUTH_STOP_DDNS_FORWARDER DDNS UPDATE handling stopped This is a debug message indicating that b10-auth has received a message that it should stop internally forwarding UPDATE message to b10-ddns. diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h index 2aaf4acec2..1fca8e122b 100644 --- a/src/bin/auth/auth_srv.h +++ b/src/bin/auth/auth_srv.h @@ -202,25 +202,6 @@ public: /// void setXfrinSession(isc::cc::AbstractSession* xfrin_session); - /// \brief Set the communication session with Statistics. - /// - /// This function never throws an exception as far as - /// AuthCounters::setStatisticsSession() doesn't throw. - /// - /// Note: this interface is tentative. We'll revisit the ASIO and - /// session frameworks, at which point the session will probably - /// be passed on construction of the server. - /// - /// \param statistics_session A Session object over which statistics - /// information is exchanged with statistics module. - /// The session must be established before setting in the server - /// object. - /// Ownership isn't transferred: the caller is responsible for keeping - /// this object to be valid while the server object is working and for - /// disconnecting the session and destroying the object when the server - /// is shutdown. - void setStatisticsSession(isc::cc::AbstractSession* statistics_session); - /// \brief Returns statistics data /// /// This function can throw an exception from diff --git a/src/bin/auth/command.cc b/src/bin/auth/command.cc index 0a23b113b1..bc9027d679 100644 --- a/src/bin/auth/command.cc +++ b/src/bin/auth/command.cc @@ -136,7 +136,7 @@ public: class GetStatsCommand : public AuthCommand { public: virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) { - LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_RECEIVED_SENDSTATS); + LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_RECEIVED_GETSTATS); return (createAnswer(0, server.getStatistics())); } }; diff --git a/src/bin/auth/statistics.h b/src/bin/auth/statistics.h index 322e2d6aed..4b0eae2f01 100644 --- a/src/bin/auth/statistics.h +++ b/src/bin/auth/statistics.h @@ -35,8 +35,6 @@ class AuthCountersImpl; /// statistics module. /// /// This class is designed to be a part of \c AuthSrv. -/// Call \c setStatisticsSession() to set a session to communicate with -/// statistics module like Xfrin session. /// Call \c inc() to increment a counter for specific type of query in /// the query processing function. use \c enum \c CounterType to specify /// the type of query.