mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

[2960] Remove dummy logging code that was a precursor to libb10-log

Browse Source
This commit is contained in:
Mukund Sivaraman
2013-07-26 17:16:16 +05:30
parent bb117dc8ad
commit df8447e4fa
7 changed files with 0 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/asiodns/tcp_server.cc
View File

@@ -14,8 +14,6 @@
#include <config.h> #include <config.h>
#include <log/dummylog.h>
#include <util/buffer.h> #include <util/buffer.h>
#include <asio.hpp> #include <asio.hpp>

3
src/lib/asiodns/udp_server.cc
View File

@@ -21,8 +21,6 @@
#include <config.h> #include <config.h>
#include <log/dummylog.h>
#include <asio.hpp> #include <asio.hpp>
#include <asio/error.hpp> #include <asio/error.hpp>
#include <asiolink/dummy_io_cb.h> #include <asiolink/dummy_io_cb.h>
@@ -35,7 +33,6 @@
using namespace asio; using namespace asio;
using asio::ip::udp; using asio::ip::udp;
using isc::log::dlog;
using namespace std; using namespace std;
using namespace isc::dns; using namespace isc::dns;

1
src/lib/asiolink/tcp_socket.h
View File

@@ -19,7 +19,6 @@
#error "asio.hpp must be included before including this, see asiolink.h as to why" #error "asio.hpp must be included before including this, see asiolink.h as to why"
#endif #endif
#include <log/dummylog.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> // for some IPC/network system calls #include <unistd.h> // for some IPC/network system calls

1
src/lib/asiolink/udp_socket.h
View File

@@ -19,7 +19,6 @@
#error "asio.hpp must be included before including this, see asiolink.h as to why" #error "asio.hpp must be included before including this, see asiolink.h as to why"
#endif #endif
#include <log/dummylog.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> // for some IPC/network system calls #include <unistd.h> // for some IPC/network system calls

1
src/lib/log/Makefile.am
View File

@@ -8,7 +8,6 @@ CLEANFILES = *.gcno *.gcda
lib_LTLIBRARIES = libb10-log.la lib_LTLIBRARIES = libb10-log.la
libb10_log_la_SOURCES = libb10_log_la_SOURCES =
libb10_log_la_SOURCES += dummylog.h dummylog.cc
libb10_log_la_SOURCES += logimpl_messages.cc logimpl_messages.h libb10_log_la_SOURCES += logimpl_messages.cc logimpl_messages.h
libb10_log_la_SOURCES += log_dbglevels.h libb10_log_la_SOURCES += log_dbglevels.h
libb10_log_la_SOURCES += log_formatter.h log_formatter.cc libb10_log_la_SOURCES += log_formatter.h log_formatter.cc

37
src/lib/log/dummylog.cc
View File

@@ -1,37 +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 "dummylog.h"
#include <iostream>
using namespace std;
namespace isc {
namespace log {
bool denabled = false;
string dprefix;
void dlog(const string& message,bool error_flag) {
if (denabled || error_flag) {
if (!dprefix.empty()) {
cerr << "[" << dprefix << "] ";
}
cerr << message << endl;
}
}
}
}

61
src/lib/log/dummylog.h
View File

@@ -1,61 +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 ISC_DUMMYLOG_H
#define ISC_DUMMYLOG_H 1
#include <string>
namespace isc {
namespace log {
/// Are we doing logging?
extern bool denabled;
/**
* \short Prefix into logs.
*
* The prefix is printed in front of every log message in square brackets.
* The usual convention is to put the name of program here.
*/
extern std::string dprefix;
/**
* \short Temporary interface to logging.
*
* This is a temporary function to do logging. It has wrong interface currently
* and should be replaced by something else. Its main purpose now is to mark
* places where logging should happen. When it is removed, compiler will do
* our work of finding the places.
*
* The only thing it does is printing the program prefix, message and
* a newline if denabled is true.
*
* There are no tests for this function, since it is only temporary and
* trivial. Tests will be written for the real logging framework when it is
* created.
*
* It has the d in front of the name so it is unlikely anyone will create
* a real logging function with the same name and the place wouldn't be found
* as a compilation error.
*
* @param message The message to log. The real interface will probably have
* more parameters.
* \param error_flag TODO
*/
void dlog(const std::string& message, bool error_flag=false);
}
}
#endif // ISC_DUMMYLOG_H