[#25,!14] DHCP4,6 now use Deamon to set up default logger name

diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index 6762eac8f6dda2f36ad2d6763ee253c43257dd91..5e98bdcfc9f8d0967ab3616729a01063ac8bcb52 100644 (file)
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -134,7 +134,7 @@ main(int argc, char* argv[]) {
             // We need to initialize logging, in case any error messages are to be printed.
             // This is just a test, so we don't care about lockfile.
             setenv("KEA_LOCKFILE_DIR", "none", 0);
-            CfgMgr::instance().setDefaultLoggerName(DHCP4_ROOT_LOGGER_NAME);
+            Daemon::setDefaultLoggerName(DHCP4_ROOT_LOGGER_NAME);
             Daemon::loggerInit(DHCP4_ROOT_LOGGER_NAME, verbose_mode);
 
             // Check the syntax first.
@@ -181,7 +181,7 @@ main(int argc, char* argv[]) {
         // It is important that we set a default logger name because this name
         // will be used when the user doesn't provide the logging configuration
         // in the Kea configuration file.
-        CfgMgr::instance().setDefaultLoggerName(DHCP4_ROOT_LOGGER_NAME);
+        Daemon::setDefaultLoggerName(DHCP4_ROOT_LOGGER_NAME);
 
         // Initialize logging.  If verbose, we'll use maximum verbosity.
         Daemon::loggerInit(DHCP4_ROOT_LOGGER_NAME, verbose_mode);

diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc
index c3f6f0f4289e3cdb9e1ea342b0636422b8fab685..e90254d0295042fbe69484d4b0a523084df7d195 100644 (file)
--- a/src/bin/dhcp6/main.cc
+++ b/src/bin/dhcp6/main.cc
@@ -137,8 +137,8 @@ main(int argc, char* argv[]) {
             // We need to initialize logging, in case any error messages are to be printed.
             // This is just a test, so we don't care about lockfile.
             setenv("KEA_LOCKFILE_DIR", "none", 0);
-            CfgMgr::instance().setDefaultLoggerName(DHCP6_ROOT_LOGGER_NAME);
-            isc::process::Daemon::loggerInit(DHCP6_ROOT_LOGGER_NAME, verbose_mode);
+            Daemon::setDefaultLoggerName(DHCP6_ROOT_LOGGER_NAME);
+            Daemon::loggerInit(DHCP6_ROOT_LOGGER_NAME, verbose_mode);
 
             // Check the syntax first.
             Parser6Context parser;
@@ -187,7 +187,7 @@ main(int argc, char* argv[]) {
         // It is important that we set a default logger name because this name
         // will be used when the user doesn't provide the logging configuration
         // in the Kea configuration file.
-        CfgMgr::instance().setDefaultLoggerName(DHCP6_LOGGER_NAME);
+        Daemon::setDefaultLoggerName(DHCP6_LOGGER_NAME);
 
         // Initialize logging.  If verbose, we'll use maximum verbosity.
         Daemon::loggerInit(DHCP6_LOGGER_NAME, verbose_mode);

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 30a5a9fd6d54ba4630bcaf5ffbdd543a24c24fcb..1c462abd36e11bbc4f7a039580dc16e401c57a1b 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -14,4 +14,4 @@ SUBDIRS += cql
 endif
 
 SUBDIRS += testutils hooks dhcp config stats asiodns dhcp_ddns eval \
-       cfgrpt process dhcpsrv process http
+       cfgrpt process dhcpsrv http