Skip to content

Commit

Permalink
Remove unused loggers
Browse files Browse the repository at this point in the history
Change-Id: Ifb80b7eefb53ed6ef714f1bc0df27360dd616c0d
Reviewed-on: http://review.couchbase.org/25845
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information
trondn committed Apr 25, 2013
1 parent 30647e6 commit 80d5fb2
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 216 deletions.
20 changes: 0 additions & 20 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ pkglib_LTLIBRARIES = libmemcached_utilities.la \
stdin_term_handler.la \
tap_mock_engine.la

if BUILD_SYSLOG_LOGGER
pkglib_LTLIBRARIES += syslog_logger.la
endif

if BUILD_EVENTLOG_LOGGER
pkglib_LTLIBRARIES += eventlog_logger.la
endif

noinst_LTLIBRARIES= libgenhash.la bucket_engine_mock_engine.la

sizes_CPPFLAGS = $(CPPFLAGS) -I$(top_srcdir)/daemon
Expand Down Expand Up @@ -205,18 +197,6 @@ blackhole_logger_la_SOURCES = extensions/loggers/blackhole_logger.c \
extensions/protocol_extension.h
blackhole_logger_la_LDFLAGS = -avoid-version -shared -module -no-undefined

# A logger using syslog
syslog_logger_la_CPPFLAGS = $(CPPFLAGS) -I$(top_srcdir)/extensions
syslog_logger_la_SOURCES = extensions/loggers/syslog_logger.c \
extensions/protocol_extension.h
syslog_logger_la_LDFLAGS = -avoid-version -shared -module -no-undefined

# A logger using eventlog
eventlog_logger_la_CPPFLAGS = $(CPPFLAGS) -I$(top_srcdir)/extensions
eventlog_logger_la_SOURCES = extensions/loggers/eventlog_logger.c \
extensions/protocol_extension.h
eventlog_logger_la_LDFLAGS = -avoid-version -shared -module -no-undefined

# The file-based logger doing compression
file_logger_la_CPPFLAGS = $(CPPFLAGS) -I$(top_srcdir)/extensions
file_logger_la_SOURCES = extensions/loggers/file_logger.c \
Expand Down
5 changes: 1 addition & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_C_BIGENDIAN

AC_CHECK_HEADERS_ONCE(atomic.h link.h dlfcn.h inttypes.h umem.h priv.h sysexits.h sys/wait.h sys/socket.h netinet/in.h netdb.h unistd.h sys/un.h sys/stat.h sys/resource.h sys/uio.h netinet/tcp.h pwd.h sys/mman.h syslog.h windows.h zlib.h)

AM_CONDITIONAL(BUILD_SYSLOG_LOGGER, test "x$ac_cv_header_syslog_h" = "xyes")
AM_CONDITIONAL(BUILD_EVENTLOG_LOGGER, test "x$ac_cv_header_windows_h" = "xyes")
AC_CHECK_HEADERS_ONCE(atomic.h link.h dlfcn.h inttypes.h umem.h priv.h sysexits.h sys/wait.h sys/socket.h netinet/in.h netdb.h unistd.h sys/un.h sys/stat.h sys/resource.h sys/uio.h netinet/tcp.h pwd.h sys/mman.h windows.h zlib.h)

AC_ARG_ENABLE(dtrace,
[AS_HELP_STRING([--enable-dtrace],[Enable dtrace probes])])
Expand Down
93 changes: 0 additions & 93 deletions extensions/loggers/eventlog_logger.c

This file was deleted.

88 changes: 0 additions & 88 deletions extensions/loggers/syslog_logger.c

This file was deleted.

11 changes: 0 additions & 11 deletions win32/Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ BINARIES= mcstat.exe \
.libs/basic_engine_testsuite.so \
.libs/default_engine.so \
.libs/bucket_engine.so \
.libs/eventlog_logger.so \
.libs/file_logger.so \
.libs/stdin_term_handler.so

Expand Down Expand Up @@ -118,9 +117,6 @@ BUCKET_ENGINE_OBJS = ${BUCKET_ENGINE_SRC:%.c=.libs/%.o}
STDIN_TERM_HANDLER_SRC = extensions/daemon/stdin_check.c
STDIN_TERM_HANDLER_OBJS = ${STDIN_TERM_HANDLER_SRC:%.c=.libs/%.o}

EVENTLOG_LOGGER_SRC = extensions/loggers/eventlog_logger.c
EVENTLOG_LOGGER_OBJS = ${EVENTLOG_LOGGER_SRC:%.c=.libs/%.o}

FILE_LOGGER_SRC = extensions/loggers/file_logger.c
FILE_LOGGER_OBJS = ${FILE_LOGGER_SRC:%.c=.libs/%.o}

Expand Down Expand Up @@ -161,10 +157,6 @@ sizes.exe: ${OBJDIR} ${GENFILES} $(SIZES_OBJS)
${LINK.c} -o $@ -shared ${STDIN_TERM_HANDLER_OBJS} ${LIBS} \
${LIB} -lpthread

.libs/eventlog_logger.so: ${OBJDIR} $(EVENTLOG_LOGGER_OBJS)
${LINK.c} -o $@ -shared ${EVENTLOG_LOGGER_OBJS} ${LIBS} \
${LIB}

.libs/file_logger.so: ${OBJDIR} $(FILE_LOGGER_OBJS)
${LINK.c} -o $@ -shared ${FILE_LOGGER_OBJS} ${LIBS} \
${LIB} -lpthread
Expand Down Expand Up @@ -197,8 +189,6 @@ clean:
${MEMCACHED_OBJS} \
${SIZES_OBJS:.o=.d} \
${SIZES_OBJS} \
${EVENTLOG_LOGGER_OBJS:.o=.d} \
${EVENTLOG_LOGGER_OBJS} \
${FILE_LOGGER_OBJS:.o=.d} \
${FILE_LOGGER_OBJS} \
${STDIN_TERM_HANDLER_OBJS:.o=.d} \
Expand All @@ -211,6 +201,5 @@ clean:
${MEMCACHED_OBJS:.o=.d} \
${MCSTAT_OBJS:.o=.d} \
${SIZES_OBJS:.o=.d} \
${EVENTLOG_LOGGER_OBJS:.o=.d} \
${FILE_LOGGER_OBJS:.o=.d} \
${STDIN_TERM_HANDLER_OBJS:.o=.d}

0 comments on commit 80d5fb2

Please sign in to comment.