Repository: trafficserver Updated Branches: refs/heads/master a5997453c -> 06a87ca9c
Remove MGMT_USE_SYSLOG MGMT_USE_SYSLOG is always true and there's no build system support for setting it. There are plenty of places that assume syslog support, so it's not clear that this is useful at all. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/06a87ca9 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/06a87ca9 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/06a87ca9 Branch: refs/heads/master Commit: 06a87ca9c6fa67d916223fc0c94a044986261ce5 Parents: a599745 Author: James Peach <[email protected]> Authored: Mon Jul 28 11:26:40 2014 -0700 Committer: James Peach <[email protected]> Committed: Mon Jul 28 11:26:40 2014 -0700 ---------------------------------------------------------------------- cmd/traffic_cop/Makefile.am | 3 --- configure.ac | 4 ---- mgmt/LocalManager.cc | 4 ---- mgmt/LocalManager.h | 2 -- mgmt/Main.cc | 10 ---------- mgmt/Makefile.am | 3 --- mgmt/api/Makefile.am | 3 --- mgmt/cluster/Makefile.am | 3 --- mgmt/stats/Makefile.am | 3 --- mgmt/utils/Makefile.am | 3 --- mgmt/web2/Makefile.am | 3 --- 11 files changed, 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/cmd/traffic_cop/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am index 482075a..653d4e7 100644 --- a/cmd/traffic_cop/Makefile.am +++ b/cmd/traffic_cop/Makefile.am @@ -25,9 +25,6 @@ AM_CPPFLAGS = $(iocore_include_dirs) \ -I$(top_srcdir)/mgmt/cluster \ -I$(top_srcdir)/mgmt/api/include -MGMT_DEFS = @MGMT_DEFS@ -DEFS += $(MGMT_DEFS) - bin_PROGRAMS = traffic_cop traffic_cop_SOURCES = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index c5f18c5..01383e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1841,8 +1841,6 @@ iocore_include_dirs="-I\$(top_srcdir)/iocore/eventsystem \ # Testing Framework suffix generation hack TFW_PACKAGE_SUFFIX=$os_type -MGMT_DEFS="$MGMT_DEFS -DMGMT_USE_SYSLOG" - AC_SUBST([API_DEFS]) AC_SUBST([CC]) AC_SUBST([CFLAGS]) @@ -1854,7 +1852,6 @@ AC_SUBST([EXTRA_CXX_LDFLAGS]) AC_SUBST([LIBTOOL_LINK_FLAGS]) AC_SUBST([iocore_include_dirs]) AC_SUBST([LDFLAGS]) -AC_SUBST([MGMT_DEFS]) AC_SUBST([SHARED_CFLAGS]) AC_SUBST([SHARED_CXXFLAGS]) AC_SUBST([SHARED_CXXLINKFLAGS]) @@ -2004,6 +2001,5 @@ AC_MSG_NOTICE([Build option summary: EXTRA_CC_LDFLAGS: $EXTRA_CC_LDFLAGS EXTRA_CXX_LDFLAGS: $EXTRA_CXX_LDFLAGS LIBTOOL_LINK_FLAGS: $LIBTOOL_LINK_FLAGS - MGMT_DEFS: $MGMT_DEFS API_DEFS: $API_DEFS ]) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/LocalManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc index 476ce82..3ffb141 100644 --- a/mgmt/LocalManager.cc +++ b/mgmt/LocalManager.cc @@ -51,9 +51,7 @@ LocalManager::mgmtCleanup() if (virt_map) { virt_map->rl_downAddrs(); // We are bailing done need to worry about table } -#ifdef MGMT_USE_SYSLOG closelog(); -#endif /* MGMT_USE_SYSLOG */ return; } @@ -204,9 +202,7 @@ LocalManager::LocalManager(bool proxy_on) ats_scoped_str rundir(RecConfigReadRuntimeDir()); ats_scoped_str bindir(RecConfigReadBinDir()); -#ifdef MGMT_USE_SYSLOG syslog_facility = 0; -#endif ccom = NULL; proxy_started_at = -1; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/LocalManager.h ---------------------------------------------------------------------- diff --git a/mgmt/LocalManager.h b/mgmt/LocalManager.h index eb3e215..a92d38f 100644 --- a/mgmt/LocalManager.h +++ b/mgmt/LocalManager.h @@ -139,9 +139,7 @@ public: volatile int internal_ticker; volatile pid_t watched_process_pid; -#ifdef MGMT_USE_SYSLOG int syslog_facility; -#endif #if TS_HAS_WCCP wccp::Cache wccp_cache; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/Main.cc ---------------------------------------------------------------------- diff --git a/mgmt/Main.cc b/mgmt/Main.cc index 2470be4..ea1f12d 100644 --- a/mgmt/Main.cc +++ b/mgmt/Main.cc @@ -322,16 +322,12 @@ set_process_limits(int fds_throttle) lim.rlim_cur = lim.rlim_max = static_cast<rlim_t>(lim.rlim_max * file_max_pct); if (!setrlimit(RLIMIT_NOFILE, &lim) && !getrlimit(RLIMIT_NOFILE, &lim)) { fds_limit = (int) lim.rlim_cur; -#ifdef MGMT_USE_SYSLOG syslog(LOG_NOTICE, "NOTE: RLIMIT_NOFILE(%d):cur(%d),max(%d)",RLIMIT_NOFILE, (int)lim.rlim_cur, (int)lim.rlim_max); } else { syslog(LOG_NOTICE, "NOTE: Unable to set RLIMIT_NOFILE(%d):cur(%d),max(%d)", RLIMIT_NOFILE, (int)lim.rlim_cur, (int)lim.rlim_max); -#endif } -#ifdef MGMT_USE_SYSLOG } else { syslog(LOG_NOTICE, "NOTE: Unable to open /proc/sys/fs/file-max"); -#endif } #endif // linux @@ -340,9 +336,7 @@ set_process_limits(int fds_throttle) lim.rlim_cur = (lim.rlim_max = (rlim_t) fds_throttle); if (!setrlimit(RLIMIT_NOFILE, &lim) && !getrlimit(RLIMIT_NOFILE, &lim)) { fds_limit = (int) lim.rlim_cur; -#ifdef MGMT_USE_SYSLOG syslog(LOG_NOTICE, "NOTE: RLIMIT_NOFILE(%d):cur(%d),max(%d)",RLIMIT_NOFILE, (int)lim.rlim_cur, (int)lim.rlim_max); -#endif } } } @@ -534,7 +528,6 @@ main(int argc, char **argv) } -#ifdef MGMT_USE_SYSLOG // Bootstrap with LOG_DAEMON until we've read our configuration if (log_to_syslog) { openlog("traffic_manager", LOG_PID | LOG_NDELAY | LOG_NOWAIT, LOG_DAEMON); @@ -542,7 +535,6 @@ main(int argc, char **argv) syslog(LOG_NOTICE, "NOTE: --- Manager Starting ---"); syslog(LOG_NOTICE, "NOTE: Manager Version: %s", appVersionInfo.FullVersionInfoStr); } -#endif /* MGMT_USE_SYSLOG */ // Bootstrap the Diags facility so that we can use it while starting // up the manager @@ -618,7 +610,6 @@ main(int argc, char **argv) // RecSetRecordString("proxy.node.version.manager.build_compile_flags", // appVersionInfo.BldCompileFlagsStr); -#ifdef MGMT_USE_SYSLOG if (log_to_syslog) { char sys_var[] = "proxy.config.syslog_facility"; char *facility_str = NULL; @@ -646,7 +637,6 @@ main(int argc, char **argv) } else { lmgmt->syslog_facility = -1; } -#endif /* MGMT_USE_SYSLOG */ // Find out our hostname so we can use it as part of the initialization setHostnameVar(); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index a2622f9..8241ab8 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -36,9 +36,6 @@ AM_CPPFLAGS = $(ink_with_modules_local) \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib -MGMT_DEFS = @MGMT_DEFS@ -DEFS += $(MGMT_DEFS) - noinst_LIBRARIES = libmgmt_p.a bin_PROGRAMS = traffic_manager http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/api/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am index 20d1c49..96f8f8b 100644 --- a/mgmt/api/Makefile.am +++ b/mgmt/api/Makefile.am @@ -31,9 +31,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib -MGMT_DEFS = @MGMT_DEFS@ -DEFS += $(MGMT_DEFS) - noinst_LIBRARIES = libmgmtapilocal.a libmgmtapilocal_a_SOURCES = \ CfgContextDefs.h \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am index 52fe262..c33b045 100644 --- a/mgmt/cluster/Makefile.am +++ b/mgmt/cluster/Makefile.am @@ -27,9 +27,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib -MGMT_DEFS = @MGMT_DEFS@ -DEFS += $(MGMT_DEFS) - noinst_LIBRARIES = libcluster.a libcluster_a_SOURCES = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/stats/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/stats/Makefile.am b/mgmt/stats/Makefile.am index 5d50150..cc6c0c0 100644 --- a/mgmt/stats/Makefile.am +++ b/mgmt/stats/Makefile.am @@ -29,9 +29,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib -MGMT_DEFS = @MGMT_DEFS@ -DEFS += $(MGMT_DEFS) - noinst_LIBRARIES = libstats.a libstats_a_SOURCES = \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/utils/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am index 91c81fe..ca7db73 100644 --- a/mgmt/utils/Makefile.am +++ b/mgmt/utils/Makefile.am @@ -31,9 +31,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/lib \ -I$(top_srcdir)/lib -MGMT_DEFS = @MGMT_DEFS@ -DEFS += $(MGMT_DEFS) - # header files used by other libraries EXTRA_DIST = MgmtHashTable.h MgmtSocket.h http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06a87ca9/mgmt/web2/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/web2/Makefile.am b/mgmt/web2/Makefile.am index 3de8c68..a376620 100644 --- a/mgmt/web2/Makefile.am +++ b/mgmt/web2/Makefile.am @@ -30,9 +30,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib -MGMT_DEFS = @MGMT_DEFS@ -DEFS += $(MGMT_DEFS) - noinst_LIBRARIES = libweb.a libweb_a_SOURCES = \ WebCompatibility.cc \
