[3743] Corrected minor review comments

Fixed, copyrights, typos, minor clean up items

diff --git a/doc/guide/logging.xml b/doc/guide/logging.xml
index 6ef86fc25f52bea2940685e67f3eecd76b900d22..ea655625b2eb5909261a4d75f66a6613c6019e75 100644 (file)
--- a/doc/guide/logging.xml
+++ b/doc/guide/logging.xml
@@ -156,7 +156,7 @@
           </listitem>
           <listitem>
             <simpara><command>kea-dhcp4.bad_packet</command> - this is the
-            logger used by the DHCPv4 server deamon for logging inbound clien
+            logger used by the DHCPv4 server deamon for logging inbound client
             packets that were dropped or to which the server responded with a
             NAK.  The allows adminstrators to configure a separate log
             output that contains only packet drop and reject entries.</simpara>

diff --git a/src/bin/dhcp4/dhcp4_log.cc b/src/bin/dhcp4/dhcp4_log.cc
index b6955aa1381a386984ef4ddfd7bf144945f28872..fa1a0b2bb0a2e7c3b694de4360ead9294862b1c1 100644 (file)
--- a/src/bin/dhcp4/dhcp4_log.cc
+++ b/src/bin/dhcp4/dhcp4_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012, 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 2014-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -23,7 +23,7 @@ const char* DHCP4_ROOT_LOGGER_NAME = "kea-dhcp4";
 const char* DHCP4_APP_LOGGER_NAME = "dhcp4";
 const char* DHCP4_BAD_PACKET_LOGGER_NAME = "bad-packet";
 
-isc::log::Logger dhcp4_logger("dhcp4");
+isc::log::Logger dhcp4_logger(DHCP4_APP_LOGGER_NAME);
 isc::log::Logger bad_packet_logger(DHCP4_BAD_PACKET_LOGGER_NAME);
 
 } // namespace dhcp

diff --git a/src/bin/dhcp4/dhcp4_log.h b/src/bin/dhcp4/dhcp4_log.h
index 23861c7e527b3ad950823a4d89a5b68a6a5b59ce..2adfa4febb83104c57a11fe3e45303549c67228c 100644 (file)
--- a/src/bin/dhcp4/dhcp4_log.h
+++ b/src/bin/dhcp4/dhcp4_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012, 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 2014-2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 5e6ea32feffb0b7f13bd5ae037cad36cb2177439..fd8d39d1ac643bd875689e1f2a27952ab0f6f40f 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -249,7 +249,7 @@ received packet failed.  The reason is given in the message.  The server
 will not send a response but will instead ignore the packet.
 
 % DHCP4_PACKET_NAK_0001 failed to select a subnet for incoming packet, src: %1, type: %2
-This warning message is output when a packet was received from a subnet
+This error message is output when a packet was received from a subnet
 for which the DHCPv4 server has not been configured. The most probable
 cause is a misconfiguration of the server.
 

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 1ff92ebd89b6bff82239223ce48c6913c1b91a06..5b4eed0b9706268fb06702468d7eb1fa81d96eff 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -1753,7 +1753,7 @@ Dhcpv4Srv::accept(const Pkt4Ptr& query) const {
     // Check if the message from directly connected client (if directly
     // connected) should be dropped or processed.
     if (!acceptDirectRequest(query)) {
-        LOG_INFO(bad_packet_logger, DHCP4_PACKET_DROP_0002)
+        LOG_DEBUG(bad_packet_logger, DBG_DHCP4_DETAIL, DHCP4_PACKET_DROP_0002)
             .arg(query->getTransid())
             .arg(query->getIface());
         return (false);