Browse Source

Merge branch 'trac3755'

Oputput started messages to the log files when
the v4, v6 or DHCP-DDNS server has completed
processing its configuration and is ready to
start processing messages.

Conflicts:
	ChangeLog
Shawn Routhier 10 years ago
parent
commit
c71c783680

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+916.	[func]		sar
+	Add a log message that indicates when the v4, v6 or
+	DHCP-DDNS server has completed processing its
+	configuration and is about to enter the loop to process
+	messages.
+	(Trac #3755, git TBD)
+	
 915.	[func]		tomek, marcin
 	The DHCPv6 server now supports the Relay-Supplied Options
 	option,	as defined in RFC 6422. The relay can insert options

+ 6 - 5
src/bin/d2/d2_messages.mes

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-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
@@ -431,10 +431,6 @@ This is a debug message issued when reverse DNS updates are disabled and
 DHCP_DDNS receives an update request containing a reverse DNS update.  The
 reverse update will not performed.
 
-% DHCP_DDNS_RUN_ENTER application has entered the event loop
-This is a debug message issued when the DHCP-DDNS application enters
-its run method.
-
 % DHCP_DDNS_RUN_EXIT application is exiting the event loop
 This is a debug message issued when the DHCP-DDNS server exits its
 event lo
@@ -457,6 +453,11 @@ error after receiving a signal.  This is a programmatic error and should be
 reported.  While The application will likely continue to operating, it may be
 unable to respond correctly to signals.
 
+% DHCP_DDNS_STARTED Kea DHCP-DDNS server version %1 started
+This informational message indicates that the DHCP-DDNS server has
+processed all configuration information and is ready to beging processing.
+The version is also printed.
+
 % DHCP_DDNS_STARTING DHCP-DDNS starting, pid: %1, version: %2
 This is an informational message issued when controller for the
 service first starts. Version is also reported.

+ 1 - 1
src/bin/d2/d2_process.cc

@@ -50,7 +50,7 @@ D2Process::init() {
 
 void
 D2Process::run() {
-    LOG_DEBUG(dctl_logger, DBGLVL_START_SHUT, DHCP_DDNS_RUN_ENTER);
+    LOG_INFO(dctl_logger, DHCP_DDNS_STARTED).arg(VERSION);
     // Loop forever until we are allowed to shutdown.
     while (!canShutdown()) {
         try {

+ 5 - 0
src/bin/dhcp4/dhcp4_messages.mes

@@ -371,6 +371,11 @@ core component within the DHCPv4 server (the Dhcpv4 server object)
 has failed.  As a result, the server will exit.  The reason for the
 failure is given within the message.
 
+% DHCP4_STARTED Kea DHCPv4 server version %1 started
+This informational message indicates that the DHCPv4 server has
+processed all configuration information and is ready to process
+DHCPv4 packets.  The version is also printed.
+
 % DHCP4_STARTING Kea DHCPv4 server version %1 starting
 This informational message indicates that the DHCPv4 server has
 processed any command-line switches and is starting. The version

+ 4 - 1
src/bin/dhcp4/main.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2012, 2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-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
@@ -161,6 +161,9 @@ main(int argc, char* argv[]) {
             return (EXIT_FAILURE);
         }
 
+        // Tell the admin we are ready to process packets
+        LOG_INFO(dhcp4_logger, DHCP4_STARTED).arg(VERSION);
+
         // And run the main loop of the server.
         server.run();
 

+ 5 - 0
src/bin/dhcp6/dhcp6_messages.mes

@@ -550,6 +550,11 @@ standalone mode, not connected to the message queue.  Standalone mode
 is only useful during program development, and should not be used in a
 production environment.
 
+% DHCP6_STARTED Kea DHCPv6 server version %1 started
+This informational message indicates that the IPv6 DHCP server has
+processed all configuration information and is ready to process
+DHCPv6 packets.  The version is also printed.
+
 % DHCP6_STARTING Kea DHCPv6 server version %1 starting
 This informational message indicates that the IPv6 DHCP server has
 processed any command-line switches and is starting. The version

+ 4 - 1
src/bin/dhcp6/main.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2014 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-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
@@ -164,6 +164,9 @@ main(int argc, char* argv[]) {
             return (EXIT_FAILURE);
         }
 
+        // Tell the admin we are ready to process packets
+        LOG_INFO(dhcp6_logger, DHCP6_STARTED).arg(VERSION);
+
         // And run the main loop of the server.
         server.run();