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 2011/05/10 23:37:37 UTC
svn commit: r1101658 - in /trafficserver/traffic/trunk/proxy: logcat.cc
logging/LogBuffer.cc logging/LogBuffer.h logging/LogBufferV1.h
logging/LogFile.cc logging/Makefile.am
Author: zwoop
Date: Tue May 10 21:37:37 2011
New Revision: 1101658
URL: http://svn.apache.org/viewvc?rev=1101658&view=rev
Log:
TS-771 Remove remaining v1 log buffer code
Removed:
trafficserver/traffic/trunk/proxy/logging/LogBufferV1.h
Modified:
trafficserver/traffic/trunk/proxy/logcat.cc
trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc
trafficserver/traffic/trunk/proxy/logging/LogBuffer.h
trafficserver/traffic/trunk/proxy/logging/LogFile.cc
trafficserver/traffic/trunk/proxy/logging/Makefile.am
Modified: trafficserver/traffic/trunk/proxy/logcat.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logcat.cc?rev=1101658&r1=1101657&r2=1101658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logcat.cc (original)
+++ trafficserver/traffic/trunk/proxy/logcat.cc Tue May 10 21:37:37 2011
@@ -43,7 +43,6 @@
#include "LogObject.h"
#include "LogConfig.h"
#include "LogBuffer.h"
-#include "LogBufferV1.h"
#include "LogUtils.h"
#include "LogSock.h"
#include "Log.h"
Modified: trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc?rev=1101658&r1=1101657&r2=1101658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc Tue May 10 21:37:37 2011
@@ -50,7 +50,6 @@
#include "LogAccess.h"
#include "LogConfig.h"
#include "LogBuffer.h"
-#include "LogBufferV1.h"
#include "LogFormatType.h"
#include "Log.h"
Modified: trafficserver/traffic/trunk/proxy/logging/LogBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h?rev=1101658&r1=1101657&r2=1101658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogBuffer.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogBuffer.h Tue May 10 21:37:37 2011
@@ -29,8 +29,6 @@
#include "libts.h"
#include "LogFormatType.h"
#include "LogLimits.h"
-
-#include "LogBufferV1.h"
#include "LogAccess.h"
class LogObject;
@@ -411,11 +409,6 @@ LogBufferIterator::LogBufferIterator(Log
m_buffer_entry_count = header->entry_count;
break;
- case 1:
- m_next = (char *) header + ((LogBufferHeaderV1 *) header)->data_offset;
- m_buffer_entry_count = ((LogBufferHeaderV1 *) header)->entry_count;
- break;
-
default:
Note("Invalid LogBuffer version %d in LogBufferIterator; "
"current version is %d", header->version, LOG_SEGMENT_VERSION);
Modified: trafficserver/traffic/trunk/proxy/logging/LogFile.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogFile.cc?rev=1101658&r1=1101657&r2=1101658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogFile.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogFile.cc Tue May 10 21:37:37 2011
@@ -45,7 +45,6 @@
#include "LogFilter.h"
#include "LogFormat.h"
#include "LogBuffer.h"
-#include "LogBufferV1.h"
#include "LogFile.h"
#include "LogHost.h"
#include "LogObject.h"
@@ -582,7 +581,6 @@ LogFile::write_ascii_logbuffer(LogBuffer
int fmt_line_bytes = 0;
int bytes = 0;
- LogBufferHeaderV1 *v1_buffer_header;
LogFormatType format_type;
char *fieldlist_str;
char *printf_str;
@@ -595,13 +593,6 @@ LogFile::write_ascii_logbuffer(LogBuffer
printf_str = buffer_header->fmt_printf();
break;
- case 1:
- v1_buffer_header = (LogBufferHeaderV1 *) buffer_header;
- format_type = (LogFormatType) v1_buffer_header->format_type;
- fieldlist_str = v1_buffer_header->symbol_str;
- printf_str = v1_buffer_header->printf_str;
- break;
-
default:
Note("Invalid LogBuffer version %d in write_ascii_logbuffer; "
"current version is %d", buffer_header->version, LOG_SEGMENT_VERSION);
@@ -652,7 +643,6 @@ LogFile::write_ascii_logbuffer3(LogBuffe
int fmt_buf_bytes = 0;
int total_bytes = 0;
- LogBufferHeaderV1 *v1_buffer_header;
LogFormatType format_type;
char *fieldlist_str;
char *printf_str;
@@ -664,13 +654,6 @@ LogFile::write_ascii_logbuffer3(LogBuffe
printf_str = buffer_header->fmt_printf();
break;
- case 1:
- v1_buffer_header = (LogBufferHeaderV1 *) buffer_header;
- format_type = (LogFormatType) v1_buffer_header->format_type;
- fieldlist_str = v1_buffer_header->symbol_str;
- printf_str = v1_buffer_header->printf_str;
- break;
-
default:
Note("Invalid LogBuffer version %d in write_ascii_logbuffer; "
"current version is %d", buffer_header->version, LOG_SEGMENT_VERSION);
Modified: trafficserver/traffic/trunk/proxy/logging/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/Makefile.am?rev=1101658&r1=1101657&r2=1101658&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/logging/Makefile.am Tue May 10 21:37:37 2011
@@ -43,7 +43,6 @@ liblogging_a_SOURCES = \
LogBuffer.cc \
LogBuffer.h \
LogBufferSink.h \
- LogBufferV1.h \
Log.cc \
Log.h \
LogConfig.cc \