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/19 23:51:10 UTC
svn commit: r1037073 - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm proxy/Main.cc
proxy/logging/Log.cc proxy/logging/LogAccess.h proxy/mgmt2/RecordsConfig.cc
Author: zwoop
Date: Fri Nov 19 22:51:10 2010
New Revision: 1037073
URL: http://svn.apache.org/viewvc?rev=1037073&view=rev
Log:
TS-547 Small cleanup of unusued config.
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/logging/Log.cc
trafficserver/traffic/trunk/proxy/logging/LogAccess.h
trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
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=1037073&r1=1037072&r2=1037073&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 Fri Nov 19 22:51:10 2010
@@ -615,7 +615,6 @@ The Apache Traffic Server Administration
proxy.config.raft.server_port
proxy.config.remap.num_remap_threads
proxy.config.remap.use_remap_processor
- proxy.config.resource.target_maxmem_mb
proxy.config.res_track_memory
proxy.config.reverse_proxy.enabled
proxy.config.reverse_proxy.oldasxbehavior
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1037073&r1=1037072&r2=1037073&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Fri Nov 19 22:51:10 2010
@@ -1676,7 +1676,6 @@ main(int argc, char **argv)
#if TS_HAS_PROFILER
ProfilerStart("/tmp/ts.prof");
#endif
- int mem_throttling;
NOWARN_UNUSED(argc);
@@ -1786,14 +1785,8 @@ main(int argc, char **argv)
// before calling RecProcessInit()
TS_ReadConfigInteger(history_info_enabled, "proxy.config.history_info_enabled");
- TS_ReadConfigInteger(mem_throttling, "proxy.config.resource.target_maxmem_mb");
TS_ReadConfigInteger(res_track_memory, "proxy.config.res_track_memory");
- if (!res_track_memory && mem_throttling > 0) {
- Warning("Cannot disable proxy.config.res_track_memory when " "proxy.config.resource.target_maxmem_mb is enabled");
- res_track_memory = 1;
- }
-
{
XMLDom schema;
bool xmlBandwidthSchemaRead(XMLNode * node);
Modified: trafficserver/traffic/trunk/proxy/logging/Log.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/Log.cc?rev=1037073&r1=1037072&r2=1037073&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/Log.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/Log.cc Fri Nov 19 22:51:10 2010
@@ -784,7 +784,7 @@ Log::init_fields()
Ptr<LogFieldAliasTable> entry_type_map = NEW(new LogFieldAliasTable);
entry_type_map->init(N_LOG_ENTRY_TYPES,
LOG_ENTRY_HTTP, "LOG_ENTRY_HTTP",
- LOG_ENTRY_ICP, "LOG_ENTRY_ICP", LOG_ENTRY_MIXT, "LOG_ENTRY_MIXT");
+ LOG_ENTRY_ICP, "LOG_ENTRY_ICP");
field = NEW(new LogField("log_entry_type", "etype",
LogField::sINT,
&LogAccess::marshal_entry_type,
Modified: trafficserver/traffic/trunk/proxy/logging/LogAccess.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogAccess.h?rev=1037073&r1=1037072&r2=1037073&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogAccess.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogAccess.h Fri Nov 19 22:51:10 2010
@@ -123,7 +123,6 @@ enum LogEntryType
{
LOG_ENTRY_HTTP = 0,
LOG_ENTRY_ICP,
- LOG_ENTRY_MIXT,
N_LOG_ENTRY_TYPES
};
Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=1037073&r1=1037072&r2=1037073&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Fri Nov 19 22:51:10 2010
@@ -2330,14 +2330,6 @@ RecordElement RecordsConfig[] = {
,
{PROCESS, "proxy.process.log2.event_log_access_skip", "", INK_COUNTER, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- //#
- //# Some resource settings, currently only obeyed by MIXT
- //#
- //##############################################################################
- {CONFIG, "proxy.config.resource.target_maxmem_mb", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_INT, "[0-65536]",
- RA_NULL}
- ,
-
//##############################################################################
//#