You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/11/24 18:08:53 UTC
svn commit: r1038702 - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/ proxy/ proxy/config/ proxy/logging/
proxy/mgmt2/ proxy/mgmt2/api2/ proxy/mgmt2/cli2/ test/plugin/test-mgmt/
Author: zwoop
Date: Wed Nov 24 17:08:52 2010
New Revision: 1038702
URL: http://svn.apache.org/viewvc?rev=1038702&view=rev
Log:
TS-556 Remove the old (obsolete) logs.config
This format is no longer necessary, since the more advanced
XML log format is available. This also eliminates the option
to select either traditional or XML custom log formats, there
is only one such log format now (XML).
Removed:
trafficserver/traffic/trunk/proxy/config/logs.config
trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/config/Makefile.am
trafficserver/traffic/trunk/proxy/config/records.config.in
trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
trafficserver/traffic/trunk/proxy/logging/LogConfig.h
trafficserver/traffic/trunk/proxy/logging/LogFilter.cc
trafficserver/traffic/trunk/proxy/logging/LogFilter.h
trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh
trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl
trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c
Modified: trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Wed Nov 24 17:08:52 2010
@@ -509,7 +509,6 @@ The Apache Traffic Server Administration
proxy.config.log.common_log_header
proxy.config.log.common_log_is_ascii
proxy.config.log.common_log_name
- proxy.config.log.config_file
proxy.config.log.custom_logs_enabled
proxy.config.log.extended2_log_enabled
proxy.config.log.extended2_log_header
@@ -553,7 +552,6 @@ The Apache Traffic Server Administration
proxy.config.log.squid_log_is_ascii
proxy.config.log.squid_log_name
proxy.config.log.xml_config_file
- proxy.config.log.xml_logs_config
proxy.config.manager_binary
proxy.config.manager_name
proxy.config.net.accept_throttle
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Wed Nov 24 17:08:52 2010
@@ -29,8 +29,6 @@ bin_PROGRAMS = \
traffic_logcat \
traffic_logstats \
traffic_sac
-
-noinst_PROGRAMS = traffic_cust_log_fmt_cnvrt
endif
AM_CPPFLAGS = \
@@ -380,13 +378,6 @@ if BUILD_TESTS
TestHook.o
endif
-traffic_cust_log_fmt_cnvrt_SOURCES = cust_log_fmt_cnvrt.cc
-traffic_cust_log_fmt_cnvrt_LDADD = \
- $(top_builddir)/iocore/utils/libinkutils.a \
- $(top_builddir)/libinktomi++/libinktomi++.a \
- @LIBTHREAD@ \
- @LIBTCL@ @LIBRT@ @LIBICONV@ @LIBDL@ @LIBEXECINFO@
-
libClusterHashStandalone_a_SOURCES = \
ClusterHashStandalone.cc \
$(top_srcdir)/libinktomi++/ParseRules.cc
Modified: trafficserver/traffic/trunk/proxy/config/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/Makefile.am?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/config/Makefile.am Wed Nov 24 17:08:52 2010
@@ -36,7 +36,6 @@ dist_sysconf_DATA = \
icp.config \
ip_allow.config \
log_hosts.config \
- logs.config \
logs_xml.config \
mgmt_allow.config \
mgr.cnf \
Modified: trafficserver/traffic/trunk/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.in?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.in Wed Nov 24 17:08:52 2010
@@ -398,48 +398,46 @@ CONFIG proxy.config.hostdb.strict_round_
# 1: log errors only
# 2: log transactions only
# 3: full logging (errors + transactions)
-CONFIG proxy.config.log2.logging_enabled INT 3
-CONFIG proxy.config.log2.max_secs_per_buffer INT 5
-CONFIG proxy.config.log2.max_space_mb_for_logs INT 25000
-CONFIG proxy.config.log2.max_space_mb_for_orphan_logs INT 25
-CONFIG proxy.config.log2.max_space_mb_headroom INT 3000
-CONFIG proxy.config.log2.hostname STRING localhost
-CONFIG proxy.config.log2.logfile_dir STRING @rel_logdir@
-CONFIG proxy.config.log2.logfile_perm STRING rw-r--r--
-CONFIG proxy.config.log2.custom_logs_enabled INT 0
-# 0: old log format, 1: new xml log format (default)
-CONFIG proxy.config.log2.xml_logs_config INT 1
-CONFIG proxy.config.log2.squid_log_enabled INT 1
-CONFIG proxy.config.log2.squid_log_is_ascii INT 0
-CONFIG proxy.config.log2.squid_log_name STRING squid
-CONFIG proxy.config.log2.squid_log_header STRING NULL
-CONFIG proxy.config.log2.common_log_enabled INT 0
-CONFIG proxy.config.log2.common_log_is_ascii INT 1
-CONFIG proxy.config.log2.common_log_name STRING common
-CONFIG proxy.config.log2.common_log_header STRING NULL
-CONFIG proxy.config.log2.extended_log_enabled INT 0
-CONFIG proxy.config.log2.extended_log_is_ascii INT 0
-CONFIG proxy.config.log2.extended_log_name STRING extended
-CONFIG proxy.config.log2.extended_log_header STRING NULL
-CONFIG proxy.config.log2.extended2_log_enabled INT 0
-CONFIG proxy.config.log2.extended2_log_is_ascii INT 1
-CONFIG proxy.config.log2.extended2_log_name STRING extended2
-CONFIG proxy.config.log2.extended2_log_header STRING NULL
-CONFIG proxy.config.log2.separate_icp_logs INT 0
-CONFIG proxy.config.log2.separate_mixt_logs INT 0
-CONFIG proxy.config.log2.separate_host_logs INT 0
-LOCAL proxy.local.log2.collation_mode INT 0
-CONFIG proxy.config.log2.collation_host STRING NULL
-CONFIG proxy.config.log2.collation_port INT 8085
-CONFIG proxy.config.log2.collation_secret STRING foobar
-CONFIG proxy.config.log2.collation_host_tagged INT 0
-CONFIG proxy.config.log2.collation_retry_sec INT 5
-CONFIG proxy.config.log2.rolling_enabled INT 1
-CONFIG proxy.config.log2.rolling_interval_sec INT 86400
-CONFIG proxy.config.log2.rolling_offset_hr INT 0
-CONFIG proxy.config.log2.rolling_size_mb INT 10
-CONFIG proxy.config.log2.auto_delete_rolled_files INT 1
-CONFIG proxy.config.log2.sampling_frequency INT 1
+CONFIG proxy.config.log.logging_enabled INT 3
+CONFIG proxy.config.log.max_secs_per_buffer INT 5
+CONFIG proxy.config.log.max_space_mb_for_logs INT 25000
+CONFIG proxy.config.log.max_space_mb_for_orphan_logs INT 25
+CONFIG proxy.config.log.max_space_mb_headroom INT 3000
+CONFIG proxy.config.log.hostname STRING localhost
+CONFIG proxy.config.log.logfile_dir STRING @rel_logdir@
+CONFIG proxy.config.log.logfile_perm STRING rw-r--r--
+CONFIG proxy.config.log.custom_logs_enabled INT 0
+CONFIG proxy.config.log.squid_log_enabled INT 1
+CONFIG proxy.config.log.squid_log_is_ascii INT 0
+CONFIG proxy.config.log.squid_log_name STRING squid
+CONFIG proxy.config.log.squid_log_header STRING NULL
+CONFIG proxy.config.log.common_log_enabled INT 0
+CONFIG proxy.config.log.common_log_is_ascii INT 1
+CONFIG proxy.config.log.common_log_name STRING common
+CONFIG proxy.config.log.common_log_header STRING NULL
+CONFIG proxy.config.log.extended_log_enabled INT 0
+CONFIG proxy.config.log.extended_log_is_ascii INT 0
+CONFIG proxy.config.log.extended_log_name STRING extended
+CONFIG proxy.config.log.extended_log_header STRING NULL
+CONFIG proxy.config.log.extended2_log_enabled INT 0
+CONFIG proxy.config.log.extended2_log_is_ascii INT 1
+CONFIG proxy.config.log.extended2_log_name STRING extended2
+CONFIG proxy.config.log.extended2_log_header STRING NULL
+CONFIG proxy.config.log.separate_icp_logs INT 0
+CONFIG proxy.config.log.separate_mixt_logs INT 0
+CONFIG proxy.config.log.separate_host_logs INT 0
+LOCAL proxy.local.log.collation_mode INT 0
+CONFIG proxy.config.log.collation_host STRING NULL
+CONFIG proxy.config.log.collation_port INT 8085
+CONFIG proxy.config.log.collation_secret STRING foobar
+CONFIG proxy.config.log.collation_host_tagged INT 0
+CONFIG proxy.config.log.collation_retry_sec INT 5
+CONFIG proxy.config.log.rolling_enabled INT 1
+CONFIG proxy.config.log.rolling_interval_sec INT 86400
+CONFIG proxy.config.log.rolling_offset_hr INT 0
+CONFIG proxy.config.log.rolling_size_mb INT 10
+CONFIG proxy.config.log.auto_delete_rolled_files INT 1
+CONFIG proxy.config.log.sampling_frequency INT 1
##############################################################################
#
# Reverse Proxy
Modified: trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogConfig.cc Wed Nov 24 17:08:52 2010
@@ -158,8 +158,6 @@ LogConfig::setup_default_values()
roll_log_files_now = FALSE;
custom_logs_enabled = FALSE;
- xml_logs_config = FALSE;
- config_file = xstrdup("logs.config");
xml_config_file = xstrdup("logs_xml.config");
hosts_config_file = xstrdup("log_hosts.config");
@@ -496,17 +494,6 @@ LogConfig::read_configuration_variables(
custom_logs_enabled = val;
};
- val = (int) LOG_ConfigReadInteger("proxy.config.log.xml_logs_config");
- if (val == 0 || val == 1) {
- xml_logs_config = val;
- };
-
- ptr = LOG_ConfigReadString("proxy.config.log.config_file");
- if (ptr != NULL) {
- xfree(config_file);
- config_file = ptr;
- };
-
ptr = LOG_ConfigReadString("proxy.config.log.xml_config_file");
if (ptr != NULL) {
xfree(xml_config_file);
@@ -665,7 +652,6 @@ LogConfig::~LogConfig()
xfree(extended2_log_header);
xfree(collation_host);
xfree(collation_secret);
- xfree(config_file);
xfree(xml_config_file);
xfree(hosts_config_file);
xfree(search_log_file_one);
@@ -834,7 +820,6 @@ LogConfig::display(FILE * fd)
fprintf(fd, " hostname = %s\n", hostname);
fprintf(fd, " logfile_dir = %s\n", logfile_dir);
fprintf(fd, " logfile_perm = 0%o\n", logfile_perm);
- fprintf(fd, " config_file = %s\n", config_file);
fprintf(fd, " xml_config_file = %s\n", xml_config_file);
fprintf(fd, " hosts_config_file = %s\n", hosts_config_file);
fprintf(fd, " squid_log_enabled = %d\n", squid_log_enabled);
@@ -1223,13 +1208,8 @@ LogConfig::setup_log_objects()
}
if (custom_logs_enabled) {
-
- if (xml_logs_config) {
- /* Read xml configuration from logs_xml.config file. */
- read_xml_log_config(0);
- } else {
- read_old_log_config();
- }
+ /* Read xml configuration from logs_xml.config file. */
+ read_xml_log_config(0);
}
/* */
@@ -1346,8 +1326,6 @@ LogConfig::register_config_callbacks()
// CUSTOM LOGGING
LOG_RegisterConfigUpdateFunc("proxy.config.log.custom_logs_enabled", &LogConfig::reconfigure, NULL);
- LOG_RegisterConfigUpdateFunc("proxy.config.log.xml_logs_config", &LogConfig::reconfigure, NULL);
- LOG_RegisterConfigUpdateFunc("proxy.config.log.config_file", &LogConfig::reconfigure, NULL);
LOG_RegisterConfigUpdateFunc("proxy.config.log.xml_config_file", &LogConfig::reconfigure, NULL);
LOG_RegisterConfigUpdateFunc("proxy.config.log.hosts_config_file", &LogConfig::reconfigure, NULL);
@@ -1733,154 +1711,6 @@ LogConfig::update_space_used()
/*-------------------------------------------------------------------------
- LogConfig::read_old_log_config
- -------------------------------------------------------------------------*/
-
-void
-LogConfig::read_old_log_config()
-{
- char config_path[PATH_MAX];
- char line[LOG_MAX_FORMAT_LINE];
- char copy[LOG_MAX_FORMAT_LINE];
- int line_num = 0;
-
- if (config_file == NULL) {
- Note("No log config file to read");
- return;
- }
-
- snprintf(config_path, PATH_MAX, "%s/%s", system_config_directory, config_file);
-
- Debug("log-config", "Reading log config file %s", config_path);
-
- int fd =::open(config_path, O_RDONLY);
- if (fd < 0) {
- Warning("Traffic Server can't open %s for reading custom " "formats: %s.", config_path, strerror(errno));
- return;
- }
-
- while (ink_file_fd_readline(fd, LOG_MAX_FORMAT_LINE, line) > 0) {
-
- //
- // Ignore blank Lines and lines that begin with a '#'.
- //
- line_num++;
- if (*line == '\n' || *line == '#') {
- continue;
- }
- //
- // Tokenize the line; ':' is the field separator character
- //
- LogUtils::strip_trailing_newline(line);
- ink_strncpy(copy, line, sizeof(copy));
- char *entry_type = strtok(copy, ":");
-
- if (entry_type) {
-
- // format
- //
- if (strcasecmp(entry_type, "format") == 0) {
-
- char *file_name = NULL;
- char *file_header = NULL;
- LogFileFormat file_type;
-
- LogFormat *new_format = LogFormat::format_from_specification(line, &file_name, &file_header, &file_type);
-
- bool valid_format = false;
- if (new_format != NULL) {
- if (global_format_list.find_by_name(new_format->name())) {
- Status(DUP_FORMAT_MESSAGE, new_format->name());
- valid_format = false;
- } else {
- valid_format = true;
- }
- }
-
- if (valid_format) {
- LogObject *obj = NEW(new LogObject(new_format,
- logfile_dir,
- file_name, file_type,
- file_header,
- rolling_enabled,
- rolling_interval_sec,
- rolling_offset_hr,
- rolling_size_mb));
-
- if (collation_mode == SEND_NON_XML_CUSTOM_FMTS || collation_mode == SEND_STD_AND_NON_XML_CUSTOM_FMTS) {
-
- LogHost *loghost = NEW(new LogHost(obj->get_full_filename(),
- obj->get_signature()));
- ink_assert(loghost != NULL);
-
- loghost->set_name_port(collation_host, collation_port);
- obj->add_loghost(loghost, false);
-
- }
-
- global_format_list.add(new_format, false);
-
- // give object to object manager
- //
- log_object_manager.manage_object(obj);
- }
-
- xfree(file_name);
- xfree(file_header);
-
- if (valid_format) {
- continue;
- }
- }
- // filter
- //
- if (strcasecmp(entry_type, "filter") == 0) {
- char *fmt_name = NULL;
- LogFilter *filter = LogFilter::filter_from_specification(line, global_format_list, Log::global_field_list,
- &fmt_name);
- if (filter) {
- if (global_filter_list.find_by_name(filter->name())) {
- Warning("Ignoring duplicate filter definition at " "line %d", line_num);
- delete filter;
- } else {
- LogObject *obj;
- if (strcmp(fmt_name, "_global_") == 0) {
- // apply filter to all objects
- //
- log_object_manager.add_filter_to_all(filter);
- } else {
- // apply filter to object with format fmt_name
- //
- obj = log_object_manager.find_by_format_name(fmt_name);
- if (!obj) {
- Warning("There is no format named %s for " "filter at line %d", fmt_name, line_num);
- delete filter;
- xfree(fmt_name);
- continue;
- } else {
- obj->add_filter(filter);
- }
- }
- }
- if (fmt_name) {
- xfree(fmt_name);
- }
- global_filter_list.add(filter, false);
- continue;
- }
- if (fmt_name) {
- xfree(fmt_name);
- }
- }
- }
-
- Warning("Traffic Server failed to parse line %d of the " "logging config file: %s.", line_num, config_path);
- }
-
- ::close(fd);
-}
-
-/*-------------------------------------------------------------------------
LogConfig::read_xml_log_config
This is a new routine for reading the XML-based log config file.
Modified: trafficserver/traffic/trunk/proxy/logging/LogConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogConfig.h?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogConfig.h Wed Nov 24 17:08:52 2010
@@ -232,7 +232,6 @@ public:
int rolling_size_mb;
int auto_delete_rolled_files;
int custom_logs_enabled;
- int xml_logs_config;
int search_log_enabled;
int search_rolling_interval_sec;
@@ -264,7 +263,6 @@ public:
char *extended2_log_header;
char *collation_host;
char *collation_secret;
- char *config_file;
char *xml_config_file;
char *hosts_config_file;
@@ -289,7 +287,6 @@ private:
typedef Queue<PreDefinedFormatInfo> PreDefinedFormatInfoList;
- void read_old_log_config();
void read_xml_log_config(int from_memory);
char **read_log_hosts_file(size_t * nhosts);
Modified: trafficserver/traffic/trunk/proxy/logging/LogFilter.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogFilter.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogFilter.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogFilter.cc Wed Nov 24 17:08:52 2010
@@ -43,10 +43,7 @@
//#include "ink_ctype.h"
#include "SimpleTokenizer.h"
-const char *LogFilter::OPERATOR_NAME[] = { "MATCH", "CASE_INSENSITIVE_MATCH",
- "CONTAIN", "CASE_INSENSITIVE_CONTAIN"
-};
-
+const char *LogFilter::OPERATOR_NAME[] = { "MATCH", "CASE_INSENSITIVE_MATCH","CONTAIN", "CASE_INSENSITIVE_CONTAIN" };
const char *LogFilter::ACTION_NAME[] = { "REJECT", "ACCEPT" };
/*-------------------------------------------------------------------------
@@ -56,20 +53,8 @@ const char *LogFilter::ACTION_NAME[] = {
global_field_list to get the log field, but this is an unnecessary dependency
between the classes and I think should be removed. ltavera
-------------------------------------------------------------------------*/
-
LogFilter::LogFilter(const char *name, LogField * field, LogFilter::Action action, LogFilter::Operator oper)
- :
-m_name(xstrdup(name))
- ,
-m_field(NULL)
- ,
-m_action(action)
- ,
-m_operator(oper)
- ,
-m_type(INT_FILTER)
- ,
-m_num_values(0)
+ : m_name(xstrdup(name)), m_field(NULL) , m_action(action), m_operator(oper), m_type(INT_FILTER), m_num_values(0)
{
m_field = NEW(new LogField(*field));
ink_assert(m_field);
@@ -78,177 +63,16 @@ m_num_values(0)
/*-------------------------------------------------------------------------
LogFilter::~LogFilter
-------------------------------------------------------------------------*/
-
LogFilter::~LogFilter()
{
xfree(m_name);
delete m_field;
}
-/*-------------------------------------------------------------------------
- LogFilter::filter_from_specification
-
- Build a LogFilter object from the given logs.config specification.
- -------------------------------------------------------------------------*/
-
-LogFilter *
-LogFilter::filter_from_specification(char *spec,
- const LogFormatList & format_list,
- const LogFieldList & field_list, char **format_name)
-{
- LogFilter *filter;
- LogFormat *format;
- LogField *field;
- char *token;
- char *field_name;
- char *value;
- Operator oper = MATCH; /* lv: just to make gcc happy */
-
-
- // default action is REJECT to conform to semantics of old format
- //
- Action action = REJECT;
-
- // First is the word "filter"
- //
- token = strtok(spec, ":");
- if (token == NULL) {
- Debug("log-filter", "token expected");
- return NULL;
- }
- if (!strcasecmp(token, "filter")) {
- Debug("log-filter", "this is a filter");
- } else {
- Debug("log-filter", "should be 'filter'");
- return NULL;
- }
-
- // Next is the name of a format
- //
- token = strtok(NULL, ":");
- if (token == NULL) {
- Debug("log-filter", "token expected");
- return NULL;
- }
-
- *format_name = xstrdup(token);
- if (strcasecmp(*format_name, "_global_") != 0) {
- format = format_list.find_by_name(*format_name);
- if (format == NULL) {
- Warning("There is no format named %s for this filter", *format_name);
- return NULL;
- }
- }
- // Next is the field name
- //
- token = strtok(NULL, ":");
- if (token == NULL) {
- Debug("log-filter", "token expected");
- return NULL;
- }
- field_name = token;
- char *end = field_name + strlen(token);
- field_name += 2; // get past "%<"
- if (field_name >= end) {
- Warning("Invalid field specification in filter: %s", token);
- return NULL;
- }
- char *p = end;
- if (*(p - 1) != '>') {
- Warning("Invalid field specification in filter: %s", token);
- return NULL;
- }
- *(p - 1) = '\0';
-
- field = field_list.find_by_symbol(field_name);
-
- if (field == NULL) {
- Warning("There is no field named %s ", field_name);
- return NULL;
- }
- // Next is the operator
- //
- token = strtok(NULL, ":");
- if (token == NULL) {
- Debug("log-filter", "token expected");
- return NULL;
- }
- int op;
- for (op = 0; op < N_OPERATORS; ++op) {
- if (strcasecmp(token, OPERATOR_NAME[op]) == 0) {
- oper = (Operator) op;
- break;
- }
- }
- if (op == N_OPERATORS) {
- // NOMATCH is no longer a valid operator, but it is supported
- // for backward compatibility (for traditional config only)
- //
- if (strcasecmp(token, "NOMATCH") == 0) {
- action = ACCEPT;
- oper = MATCH;
- } else {
- Warning("Invalid operator \"$s\" for this filter.", token);
- return NULL;
- }
- }
- // Last is the comparison value
- //
- token = strtok(NULL, ":");
- if (token == NULL) {
- Debug("log-filter", "token expected");
- return NULL;
- }
- value = token;
-
- // create a unique filter name
- //
- const size_t buff_size = 256;
- char filter_name[buff_size];
-
- snprintf(filter_name, buff_size, "%s: %s %s %s", *format_name, field_name, OPERATOR_NAME[oper], value);
-
- // Ok, now create the LogFilter. There are two types: int and string
- // filters. Look at the field type to determine which is the one to
- // use.
- //
- switch (field->type()) {
-
- case LogField::sINT:
- filter = NEW(new LogFilterInt(filter_name, field, action, oper, value));
- ink_assert(filter != NULL);
- if (filter->get_num_values() == 0) {
- Warning("No valid comparison value(s) (%s) for field %s while "
- "defining filter %s\nFilter will not be used", value, field_name, filter_name);
- delete filter;
- return NULL;
- }
- break;
-
- case LogField::dINT:
- // FIXME: This is a double-int for http-version fields and
- // should have its own filter type.
- //
- Warning("Cannot create filter for double-int field: %s", field_name);
- return NULL;
-
- case LogField::STRING:
- filter = NEW(new LogFilterString(filter_name, field, action, oper, value));
- ink_assert(filter != NULL);
- break;
-
- default:
- Warning("Invalid log field type for field %s", field_name);
- return NULL;
- }
-
- return filter;
-}
/*-------------------------------------------------------------------------
LogFilterString::LogFilterString
-------------------------------------------------------------------------*/
-
void
LogFilterString::_setValues(size_t n, char **value)
{
@@ -275,8 +99,7 @@ LogFilterString::_setValues(size_t n, ch
LogFilterString::LogFilterString(const char *name, LogField * field,
LogFilter::Action action, LogFilter::Operator oper, char *values)
- :
-LogFilter(name, field, action, oper)
+ : LogFilter(name, field, action, oper)
{
// parse the comma-separated list of values and construct array
//
@@ -301,15 +124,13 @@ LogFilter(name, field, action, oper)
LogFilterString::LogFilterString(const char *name, LogField * field,
LogFilter::Action action, LogFilter::Operator oper, size_t num_values, char **value)
- :
-LogFilter(name, field, action, oper)
+ : LogFilter(name, field, action, oper)
{
_setValues(num_values, value);
}
LogFilterString::LogFilterString(const LogFilterString & rhs)
- :
-LogFilter(rhs.m_name, rhs.m_field, rhs.m_action, rhs.m_operator)
+ : LogFilter(rhs.m_name, rhs.m_field, rhs.m_action, rhs.m_operator)
{
_setValues(rhs.m_num_values, rhs.m_value);
}
Modified: trafficserver/traffic/trunk/proxy/logging/LogFilter.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogFilter.h?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogFilter.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogFilter.h Wed Nov 24 17:08:52 2010
@@ -75,32 +75,19 @@ public:
LogFilter(const char *name, LogField * field, Action action, Operator oper);
virtual ~ LogFilter();
- char *name()
- {
- return m_name;
- }
- Type type()
- {
- return m_type;
- }
+ char *name() const { return m_name; }
+ Type type() const { return m_type; }
+ size_t get_num_values() const { return m_num_values; };
- size_t get_num_values() const
- {
- return m_num_values;
- };
virtual bool toss_this_entry(LogAccess * lad) = 0;
virtual void display(FILE * fd = stdout) = 0;
virtual void display_as_XML(FILE * fd = stdout) = 0;
+
void reverse()
{
m_action = (m_action == REJECT ? ACCEPT : REJECT);
};
- static
- LogFilter *filter_from_specification(char *spec,
- const LogFormatList & format_list,
- const LogFieldList & field_list, char **format_name);
-
protected:
char *m_name;
LogField *m_field;
@@ -201,16 +188,16 @@ private:
int _convertStringToInt(char *val, unsigned *ival, LogFieldAliasMap * map);
// -- member functions that are not allowed --
- LogFilterInt();
- LogFilterInt & operator=(LogFilterInt & rhs);
+ LogFilterInt();
+ LogFilterInt & operator=(LogFilterInt & rhs);
};
bool filters_are_equal(LogFilter * filt1, LogFilter * filt2);
+
/*-------------------------------------------------------------------------
LogFilterList
-------------------------------------------------------------------------*/
-
class LogFilterList
{
public:
@@ -223,25 +210,15 @@ public:
LogFilter *find_by_name(char *name);
void clear();
- LogFilter *first() const
- {
- return m_filter_list.head;
- }
- LogFilter *next(LogFilter * here) const
- {
- return (here->link).next;
- }
+ LogFilter *first() const { return m_filter_list.head; }
+ LogFilter *next(LogFilter * here) const { return (here->link).next; }
+
unsigned count();
void display(FILE * fd = stdout);
void display_as_XML(FILE * fd = stdout);
- bool does_conjunction() const
- {
- return m_does_conjunction;
- };
- void set_conjunction(bool c)
- {
- m_does_conjunction = c;
- };
+
+ bool does_conjunction() const { return m_does_conjunction; };
+ void set_conjunction(bool c) { m_does_conjunction = c; };
private:
Queue<LogFilter> m_filter_list;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc Wed Nov 24 17:08:52 2010
@@ -66,7 +66,6 @@ initializeRegistry()
// NOTE: Logic that controls which files are not sync'd around the
// cluster is located in ClusterCom::constructSharedFilePacket
- configFiles->addFile("logs.config", false);
configFiles->addFile("log_hosts.config", false);
configFiles->addFile("logs_xml.config", false);
configFiles->addFile("storage.config", false);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Wed Nov 24 17:08:52 2010
@@ -1235,16 +1235,12 @@ printUsage()
void
fileUpdated(char *fname)
{
-
if (strcmp(fname, "cluster.config") == 0) {
lmgmt->signalFileChange("proxy.config.cluster.cluster_configuration");
} else if (strcmp(fname, "remap.config") == 0) {
lmgmt->signalFileChange("proxy.config.url_remap.filename");
- } else if (strcmp(fname, "logs.config") == 0) {
- lmgmt->signalFileChange("proxy.config.log.config_file");
-
} else if (strcmp(fname, "socks.config") == 0) {
lmgmt->signalFileChange("proxy.config.socks.socks_config_file");
Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Wed Nov 24 17:08:52 2010
@@ -2189,10 +2189,6 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.log.custom_logs_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.log.xml_logs_config", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
- {CONFIG, "proxy.config.log.config_file", "", INK_STRING, "logs.config", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
- ,
{CONFIG, "proxy.config.log.xml_config_file", "", INK_STRING, "logs_xml.config", RU_REREAD, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc Wed Nov 24 17:08:52 2010
@@ -978,8 +978,6 @@ RuleList::parse(char *fileBuf, const cha
m_filetype = INK_FNAME_ICP_PEER; /* icp.config */
} else if (strstr(filename, "ip_allow.config")) {
m_filetype = INK_FNAME_IP_ALLOW; /* ip_allow.config */
- } else if (strstr(filename, "logs.config")) {
- m_filetype = INK_FNAME_UNDEFINED; /* logs.config */
} else if (strstr(filename, "logs_xml.config")) {
m_filetype = INK_FNAME_LOGS_XML; /* logs_xml.config */
} else if (strstr(filename, "mgmt_allow.config")) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Wed Nov 24 17:08:52 2010
@@ -2177,14 +2177,7 @@ CmdArgs_ConfigLogging()
createArgument("custom", 1, CLI_ARGV_CONST_OPTION,
(char *) NULL, CMD_CONFIG_LOGGING_CUSTOM,
- "Custom Logging <on | off> format <traditional | xml>", (char *) NULL);
-
- createArgument("traditional", CMD_CONFIG_LOGGING_AND_CUSTOM_FORMAT, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_LOGGING_CUSTOM_FORMAT_TRADITIONAL,
- "Custom logging in traditional format", (char *) NULL);
-
- createArgument("xml", CMD_CONFIG_LOGGING_AND_CUSTOM_FORMAT, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_LOGGING_CUSTOM_FORMAT_XML, "Custom logging in XML", (char *) NULL);
+ "Custom Logging <on | off>", (char *) NULL);
createArgument("rolling", 1, CLI_ARGV_CONST_OPTION,
(char *) NULL, CMD_CONFIG_LOGGING_ROLLING,
@@ -4991,15 +4984,7 @@ ConfigLoggingCustomFormat(int arg_ref_on
if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log.xml_logs_config", &int_val);
- switch (int_val) {
- case 0:
- Cli_Printf("traditional\n");
- break;
- case 1:
- Cli_Printf("xml\n");
- break;
- }
+ Cli_Printf("xml\n");
return CLI_OK;
case 1:
{
@@ -5019,20 +5004,7 @@ ConfigLoggingCustomFormat(int arg_ref_on
if (status) {
return status;
}
- switch (arg_ref_format) {
- case CMD_CONFIG_LOGGING_CUSTOM_FORMAT_TRADITIONAL:
- int_val = 0;
- break;
- case CMD_CONFIG_LOGGING_CUSTOM_FORMAT_XML:
- int_val = 1;
- break;
- }
- status = Cli_RecordSetInt("proxy.config.log.xml_logs_config", int_val, &action_need);
- if (status) {
- return status;
- }
return (Cli_ConfigEnactChanges(action_need));
-
}
default:
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h Wed Nov 24 17:08:52 2010
@@ -239,8 +239,6 @@ typedef enum
CMD_CONFIG_LOGGING_SPLITTING_ICP,
CMD_CONFIG_LOGGING_SPLITTING_HTTP,
CMD_CONFIG_LOGGING_CUSTOM,
- CMD_CONFIG_LOGGING_CUSTOM_FORMAT_TRADITIONAL,
- CMD_CONFIG_LOGGING_CUSTOM_FORMAT_XML,
CMD_CONFIG_LOGGING_ROLLING,
CMD_CONFIG_LOGGING_OFFSET,
CMD_CONFIG_LOGGING_INTERVAL,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc Wed Nov 24 17:08:52 2010
@@ -1789,7 +1789,6 @@ ShowLogging()
Cli_RecordGetInt("proxy.config.log.separate_icp_logs", &icp_log);
Cli_RecordGetInt("proxy.config.log.separate_host_logs", &http_host_log);
Cli_RecordGetInt("proxy.config.log.separate_host_logs", &custom_log);
- Cli_RecordGetInt("proxy.config.log.xml_logs_config", &xml_log);
Cli_RecordGetInt("proxy.config.log.rolling_enabled", &rolling);
Cli_RecordGetInt("proxy.config.log.rolling_offset_hr", &roll_offset_hr);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt Wed Nov 24 17:08:52 2010
@@ -537,7 +537,6 @@ logging Logging Configuration
HTTP Host Log Splitting -- off (proxy.config.log.separate_host_logs)
Custom Logs -- off (proxy.config.log.custom_logs_enabled)
- Custom Log Definition Format -- Traditional (proxy.config.log.xml_logs_config)
Rolling -------- on (proxy.config.log.rolling_enabled)
Roll Offset Hour --- 0 (proxy.config.log.rolling_offset_hr)
@@ -1344,7 +1343,6 @@ logging Logging Configuration
syntax: config:logging custom <on | off> format <traditional | xml>
records: proxy.config.log.custom_logs_enabled
- proxy.config.log.xml_logs_config <traditional=0, xml=1>
ts# config:logging custom on format xml
+OK
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh Wed Nov 24 17:08:52 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
export FLOPPY_DEVICE="/dev/fd0"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl Wed Nov 24 17:08:52 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
export FLOPPY_DEVICE="/dev/fd0"
Modified: trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c?rev=1038702&r1=1038701&r2=1038702&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c (original)
+++ trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c Wed Nov 24 17:08:52 2010
@@ -229,7 +229,6 @@ const char *intVariables[] = {
"proxy.config.log.max_space_mb_for_orphan_logs",
"proxy.config.log.max_space_mb_headroom",
"proxy.config.log.custom_logs_enabled",
- "proxy.config.log.xml_logs_config",
"proxy.config.log.squid_log_enabled",
"proxy.config.log.squid_log_is_ascii",
"proxy.config.log.common_log_enabled",