You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/04/28 22:56:00 UTC

[1/2] git commit: TS-2754: emit a tcpinfo log on TS_EVENT_HTTP_TXN_CLOSE

Repository: trafficserver
Updated Branches:
  refs/heads/master 2309ec101 -> 7b08eb804


TS-2754: emit a tcpinfo log on TS_EVENT_HTTP_TXN_CLOSE

The tcpinfo plugin should emit a log entry when it receives the
TS_EVENT_HTTP_TXN_CLOSE event.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/44236aec
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/44236aec
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/44236aec

Branch: refs/heads/master
Commit: 44236aec23565b59c16aaa3987b132c0a261fda7
Parents: 2309ec1
Author: James Peach <jp...@apache.org>
Authored: Fri Apr 25 18:35:17 2014 +0000
Committer: James Peach <jp...@apache.org>
Committed: Mon Apr 28 13:55:20 2014 -0700

----------------------------------------------------------------------
 CHANGES                    | 2 ++
 plugins/tcpinfo/tcpinfo.cc | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/44236aec/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0c78519..cd35151 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2754] Emit a tcpinfo log on TS_EVENT_HTTP_TXN_CLOSE.
+
   *) [TS-2760] Add TSFetchClientProtoStackSet/Get() API in experimental.h.
 
   *) [TS-2743] Ignore invalid HTTP headers in SpdyNV carefully.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/44236aec/plugins/tcpinfo/tcpinfo.cc
----------------------------------------------------------------------
diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc
index b64ceb9..65ad25b 100644
--- a/plugins/tcpinfo/tcpinfo.cc
+++ b/plugins/tcpinfo/tcpinfo.cc
@@ -209,6 +209,11 @@ tcp_info_hook(TSCont contp, TSEvent event, void *edata)
     ssnp = TSHttpTxnSsnGet(txnp);
     event_name = "txn_start";
     break;
+  case TS_EVENT_HTTP_TXN_CLOSE:
+    txnp = (TSHttpTxn)edata;
+    ssnp = TSHttpTxnSsnGet(txnp);
+    event_name = "txn_close";
+    break;
   case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
     txnp = (TSHttpTxn)edata;
     ssnp = TSHttpTxnSsnGet(txnp);
@@ -217,6 +222,7 @@ tcp_info_hook(TSCont contp, TSEvent event, void *edata)
   case TS_EVENT_HTTP_SSN_CLOSE:
     ssnp = (TSHttpSsn)edata;
     event_name = "ssn_close";
+    break;
   default:
     return 0;
   }
@@ -399,7 +405,7 @@ init:
 
   if (hooks & TCPI_HOOK_TXN_START) {
     TSHttpHookAdd(TS_HTTP_TXN_START_HOOK, cont);
-    TSDebug("tcpinfo", "added hook to the close of the transaction");
+    TSDebug("tcpinfo", "added hook to the start of the transaction");
   }
 
   if (hooks & TCPI_HOOK_SEND_RESPONSE) {


[2/2] git commit: s/symnatics/semantics/

Posted by jp...@apache.org.
s/symnatics/semantics/


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7b08eb80
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7b08eb80
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7b08eb80

Branch: refs/heads/master
Commit: 7b08eb8046826f1d5230ade16dec7ec5e3a557f3
Parents: 44236ae
Author: James Peach <jp...@apache.org>
Authored: Mon Apr 28 13:51:32 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Apr 28 13:55:24 2014 -0700

----------------------------------------------------------------------
 proxy/http/HttpClientSession.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b08eb80/proxy/http/HttpClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.cc b/proxy/http/HttpClientSession.cc
index cfdbea3..d98d48a 100644
--- a/proxy/http/HttpClientSession.cc
+++ b/proxy/http/HttpClientSession.cc
@@ -302,7 +302,7 @@ HttpClientSession::do_io_close(int alerrno)
 
     // We want the client to know that that we're finished
     //  writing.  The write shutdown accomplishes this.  Unfortuantely,
-    //  the IO Core symnatics don't stop us from getting events
+    //  the IO Core semantics don't stop us from getting events
     //  on the write side of the connection like timeouts so we
     //  need to zero out the write of the continuation with
     //  the do_io_write() call (INKqa05309)