Updated Branches:
refs/heads/4.1.x 0212e7b52 -> cdf37be6d
TS-2340: fix TextLogObject log rolling
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cdf37be6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cdf37be6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cdf37be6
Branch: refs/heads/4.1.x
Commit: cdf37be6d2a95173115c563d3e61e693bf6fab25
Parents: dd25a5c
Author: bettydramit <b13621367...@gmail.com>
Authored: Tue Nov 12 20:58:25 2013 -0800
Committer: Igor GaliÄ <i.ga...@brainsware.org>
Committed: Wed Nov 13 18:14:05 2013 +0100
----------------------------------------------------------------------
CHANGES | 4 ++++
proxy/InkAPI.cc | 1 +
proxy/logging/LogObject.h | 6 +++---
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cdf37be6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 62353a4..9a5a0c5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.1.1
+
+ *) [TS-2340] Fix TextLogObject log rolling.
+ Author: bettydramit <b13621367...@gmail.com>
+
*) [TS-2333] Change the SAX callbacks to not clash with libxml2, which broke
synthetic metric completely.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cdf37be6/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index f51f4c8..a4e82c2 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -6758,6 +6758,7 @@ TSTextLogObjectCreate(const char *filename, int mode,
TSTextLogObject *new_objec
(bool) mode &
TS_LOG_MODE_ADD_TIMESTAMP,
NULL,
Log::config->rolling_enabled,
+
Log::config->collation_preproc_threads,
Log::config->rolling_interval_sec,
Log::config->rolling_offset_hr,
Log::config->rolling_size_mb));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cdf37be6/proxy/logging/LogObject.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.h b/proxy/logging/LogObject.h
index 04a1e36..06bf4c9 100644
--- a/proxy/logging/LogObject.h
+++ b/proxy/logging/LogObject.h
@@ -258,9 +258,9 @@ public:
inkcoreapi TextLogObject(const char *name, const char *log_dir,
bool timestamps, const char *header,
int rolling_enabled, int flush_threads,
- int rolling_interval_sec = 0,
- int rolling_offset_hr = 0,
- int rolling_size_mb = 0);
+ int rolling_interval_sec,
+ int rolling_offset_hr,
+ int rolling_size_mb);
inkcoreapi int write(const char *format, ...) TS_PRINTFLIKE(2, 3);
inkcoreapi int va_write(const char *format, va_list ap);
