From: Francis Dupont Date: Wed, 17 Jun 2015 20:03:49 +0000 (+0200) Subject: [3732b] Removed logging from cc library X-Git-Tag: trac3910_base~17^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=854fcd6a5d6166e261451fbc94b411cefeb2a5e2;p=thirdparty%2Fkea.git [3732b] Removed logging from cc library --- diff --git a/src/lib/cc/.gitignore b/src/lib/cc/.gitignore deleted file mode 100644 index 0dd03ab83f..0000000000 --- a/src/lib/cc/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/cc_messages.cc -/cc_messages.h -/s-messages diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am index 8bef5abe39..bbcadbddb9 100644 --- a/src/lib/cc/Makefile.am +++ b/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 diff --git a/src/lib/cc/cc_messages.mes b/src/lib/cc/cc_messages.mes deleted file mode 100644 index 3010ae9ee8..0000000000 --- a/src/lib/cc/cc_messages.mes +++ /dev/null @@ -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. diff --git a/src/lib/cc/logger.cc b/src/lib/cc/logger.cc deleted file mode 100644 index 36db88d245..0000000000 --- a/src/lib/cc/logger.cc +++ /dev/null @@ -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 - -namespace isc { -namespace cc { - -isc::log::Logger logger("cc"); - -} -} diff --git a/src/lib/cc/logger.h b/src/lib/cc/logger.h deleted file mode 100644 index d6253d0b3a..0000000000 --- a/src/lib/cc/logger.h +++ /dev/null @@ -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 -#include - -/// \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