Browse Source

[3732b] Removed logging from cc library

Francis Dupont 10 years ago
parent
commit
854fcd6a5d
5 changed files with 1 additions and 127 deletions
  1. 0 3
      src/lib/cc/.gitignore
  2. 1 23
      src/lib/cc/Makefile.am
  3. 0 32
      src/lib/cc/cc_messages.mes
  4. 0 23
      src/lib/cc/logger.cc
  5. 0 46
      src/lib/cc/logger.h

+ 0 - 3
src/lib/cc/.gitignore

@@ -1,3 +0,0 @@
-/cc_messages.cc
-/cc_messages.h
-/s-messages

+ 1 - 23
src/lib/cc/Makefile.am

@@ -2,32 +2,10 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
-
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
-if USE_GXX
-# ASIO header files used in session.cc will trigger the "unused-parameter"
-# warning.  Unfortunately there doesn't seem to be an easy way to selectively
-# avoid the error.  As a short term workaround we suppress this warning
-# for the entire this module.  See also src/bin/auth/Makefile.am.
-AM_CXXFLAGS += -Wno-unused-parameter
-AM_CXXFLAGS += -fno-strict-aliasing
-endif
 
 lib_LTLIBRARIES = libkea-cc.la
 libkea_cc_la_SOURCES = data.cc data.h
 libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
-libkea_cc_la_SOURCES += logger.cc logger.h
-nodist_libkea_cc_la_SOURCES = cc_messages.cc cc_messages.h
-libkea_cc_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la
-
-CLEANFILES = *.gcno *.gcda cc_messages.cc cc_messages.h s-messages
-
-cc_messages.cc cc_messages.h: s-messages
-
-s-messages: cc_messages.mes
-	$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/cc/cc_messages.mes
-	touch $@
-
-BUILT_SOURCES = cc_messages.cc cc_messages.h
 
-EXTRA_DIST = cc_messages.mes
+CLEANFILES = *.gcno *.gcda

+ 0 - 32
src/lib/cc/cc_messages.mes

@@ -1,32 +0,0 @@
-# Copyright (C) 2010, 2014  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
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-$NAMESPACE isc::cc
-
-% CC_RECEIVE Received a message over control channel: %1
-Debug message, noting that a message was received over control channel.
-
-% CC_SEND Sending message over control channel: '%1'
-Debug message, the code is about to send a message over the control channel.
-
-% CC_REGISTER_COMMAND_HANDLER Handler for command '%1' registered
-Command Handler for a given command has been registered. This means that
-the software enabled handling of said command.
-
-% CC_PROCESS_COMMAND Processing command '%1'
-Debug message, noting that the software is processing received command.
-
-% CC_READ_ERROR Received truncated or malformed command (%1)
-A read error indicates that either the communication was interrupted (e.g.
-truncated packet received) or the entity had sent malformed command.

+ 0 - 23
src/lib/cc/logger.cc

@@ -1,23 +0,0 @@
-// Copyright (C) 2010  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
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include <cc/logger.h>
-
-namespace isc {
-namespace cc {
-
-isc::log::Logger logger("cc");
-
-}
-}

+ 0 - 46
src/lib/cc/logger.h

@@ -1,46 +0,0 @@
-// Copyright (C) 2010  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
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#ifndef CC_LOGGER_H
-#define CC_LOGGER_H
-
-#include <cc/cc_messages.h>
-#include <log/macros.h>
-
-/// \file cc/logger.h
-/// \brief Command Channel library global logger
-///
-/// This holds the logger for the CC library. It is a private header
-/// and should not be included in any publicly used header, only in local
-/// cc files.
-
-namespace isc {
-namespace cc {
-
-/// Trace basic operation
-const int DBG_TRACE_BASIC = DBGLVL_TRACE_BASIC;
-
-/// This includes messages being sent and received, waiting for messages
-/// and alike.
-const int DBG_TRACE_DETAILED = DBGLVL_TRACE_DETAIL;
-
-// Declaration of the logger.
-extern isc::log::Logger logger;
-
-} // namespace cc
-} // namespace isc
-
-/// \brief Logger for this library
-
-#endif