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/11/13 18:04:47 UTC

[1/2] trafficserver git commit: TS-3194: remove unused proxy.config.plugin.plugin_mgmt_dir configuration

Repository: trafficserver
Updated Branches:
  refs/heads/master d37a70a7a -> efec3eb6f


TS-3194: remove unused proxy.config.plugin.plugin_mgmt_dir configuration


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

Branch: refs/heads/master
Commit: 6424aa9c5cb20faf9eb887c2e516250bfbc35153
Parents: d37a70a
Author: James Peach <jp...@apache.org>
Authored: Fri Nov 7 16:23:42 2014 -0800
Committer: James Peach <jp...@apache.org>
Committed: Thu Nov 13 08:53:05 2014 -0800

----------------------------------------------------------------------
 CHANGES                               |  4 +++-
 lib/perl/lib/Apache/TS/AdminClient.pm |  1 -
 mgmt/RecordsConfig.cc                 |  2 --
 mgmt/api/include/mgmtapi.h            | 10 ----------
 4 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6424aa9c/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a3a699d..4b328f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.2.0
- 
+
+  *) [TS-3194] Remove unused proxy.config.plugin.plugin_mgmt_dir configuration.
+
   *) [TS-3185] Increase the default spdy initial_window_size_in setting to 1 mb
 
   *) [TS-3178] ProxyAllocators Improvements

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6424aa9c/lib/perl/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
index f3c9a10..01fe9ff 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -644,7 +644,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
  proxy.config.ping.npacks_to_trans
  proxy.config.ping.timeout_sec
  proxy.config.plugin.plugin_dir
- proxy.config.plugin.plugin_mgmt_dir
  proxy.config.prefetch.child_port
  proxy.config.prefetch.config_file
  proxy.config.prefetch.default_data_proto

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6424aa9c/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 9d3c070..2c24c0b 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1391,8 +1391,6 @@ RecordElement RecordsConfig[] = {
   //# Directory in which to find plugins
   {RECT_CONFIG, "proxy.config.plugin.plugin_dir", RECD_STRING, TS_BUILD_LIBEXECDIR, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.plugin.plugin_mgmt_dir", RECD_STRING, TS_BUILD_SYSCONFDIR "/plugins_mgmt", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
-  ,
   {RECT_CONFIG, "proxy.config.plugin.load_elevated", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_READ_ONLY}
   ,
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6424aa9c/mgmt/api/include/mgmtapi.h
----------------------------------------------------------------------
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index 581c69e..0cb38ee 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -926,16 +926,6 @@ extern "C"
  * Input:  argc - argument count
  *         argv - argument array
  * Output: <none>
- * Note: To implement a program as a plugin, need to implement the TSPluginInit
- *       function and then add the plugin's name (eg. test-plugin.so) and argument
- *       list (if any) to the list in the plugin_mgmt.config file. The location of the
- *       mgmt plugins should be specified in the records.config variable
- *       "proxy.config.plugin.plugin_mgmt_dir" (if this directory is a relative
- *       pathname then, it is assumed that it is relative to the root directory
- *       defined in TS_ROOT). The default value is "etc/trafficserver/plugins_mgmt",
- *       which tells Traffic Manager to use the directory plugins_mgmt located in the
- *       same directory as records.config. You should place your shared library (*.so)
- *       into the directory you have specified.
  */
   inkexp extern void TSPluginInit(int argc, const char *argv[]);
 


[2/2] trafficserver git commit: Fix tautological comparison in Vec.h

Posted by jp...@apache.org.
Fix tautological comparison in Vec.h

../../../lib/ts/Vec.h:188:18: error: comparison of unsigned expression >= 0 is always true
[-Werror,-Wtautological-compare]
  if (i < n && i >= 0)
                 ~ ^  ~

i is of type size_t which is unsigned, so it is always >= 0.


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

Branch: refs/heads/master
Commit: efec3eb6fc83a93c77204ec9f907cef83b68e0e6
Parents: 6424aa9
Author: James Peach <jp...@apache.org>
Authored: Thu Nov 13 08:56:44 2014 -0800
Committer: James Peach <jp...@apache.org>
Committed: Thu Nov 13 08:56:44 2014 -0800

----------------------------------------------------------------------
 lib/ts/Vec.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/efec3eb6/lib/ts/Vec.h
----------------------------------------------------------------------
diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h
index 47e017a..88c04c8 100644
--- a/lib/ts/Vec.h
+++ b/lib/ts/Vec.h
@@ -185,10 +185,11 @@ Vec<C,A,S>::Vec(C c) {
 
 template <class C, class A, int S> inline C
 Vec<C,A,S>::get(size_t i) const {
-  if (i < n && i >= 0)
+  if (i < n) {
     return v[i];
-  else
+  } else {
     return C();
+  }
 }
 
 template <class C, class A, int S> inline void