You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ki...@apache.org on 2017/09/16 06:52:14 UTC
[trafficserver] branch master updated: TS-4128: select alternate
hook not working for ts_lua plugin
This is an automated email from the ASF dual-hosted git repository.
kichan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 6999c3d TS-4128: select alternate hook not working for ts_lua plugin
6999c3d is described below
commit 6999c3dbdfb12bcd91f226d2381a9213e9ebb24f
Author: Kit Chan <ki...@apache.org>
AuthorDate: Thu Sep 14 18:31:31 2017 -0700
TS-4128: select alternate hook not working for ts_lua plugin
---
doc/admin-guide/plugins/ts_lua.en.rst | 5 -----
plugins/experimental/ts_lua/ts_lua.c | 11 -----------
plugins/experimental/ts_lua/ts_lua_common.h | 2 --
plugins/experimental/ts_lua/ts_lua_hook.c | 14 --------------
plugins/experimental/ts_lua/ts_lua_util.c | 9 ---------
5 files changed, 41 deletions(-)
diff --git a/doc/admin-guide/plugins/ts_lua.en.rst b/doc/admin-guide/plugins/ts_lua.en.rst
index caf715e..649079e 100644
--- a/doc/admin-guide/plugins/ts_lua.en.rst
+++ b/doc/admin-guide/plugins/ts_lua.en.rst
@@ -107,7 +107,6 @@ each lua script:
- **'do_global_send_response'**
- **'do_global_cache_lookup_complete'**
- **'do_global_read_cache'**
-- **'do_global_select_alt'**
We can write this in plugin.config:
@@ -391,7 +390,6 @@ Hook point constants
TS_LUA_HOOK_OS_DNS
TS_LUA_HOOK_PRE_REMAP
TS_LUA_HOOK_READ_CACHE_HDR
- TS_LUA_HOOK_SELECT_ALT
TS_LUA_HOOK_TXN_CLOSE
TS_LUA_HOOK_POST_REMAP
TS_LUA_HOOK_CACHE_LOOKUP_COMPLETE
@@ -424,9 +422,6 @@ Additional Information:
| TS_HTTP_POST | TS_LUA_HOOK | YES | NO | YES |
| _REMAP_HOOK | _POST_REMAP | | | |
+-----------------------+---------------------------+----------------------+--------------------+----------------------+
-| TS_HTTP_SELECT | TS_LUA_HOOK | NO | NO | NO |
-| _ALT_HOOK | _SELECT_ALT | | | |
-+-----------------------+---------------------------+----------------------+--------------------+----------------------+
| TS_HTTP_READ | TS_LUA_HOOK | YES | NO | YES |
| _CACHE_HDR_HOOK | _READ_CACHE_HDR | | | |
+-----------------------+---------------------------+----------------------+--------------------+----------------------+
diff --git a/plugins/experimental/ts_lua/ts_lua.c b/plugins/experimental/ts_lua/ts_lua.c
index d2baae0..59cfb9e 100644
--- a/plugins/experimental/ts_lua/ts_lua.c
+++ b/plugins/experimental/ts_lua/ts_lua.c
@@ -337,10 +337,6 @@ globalHookHandler(TSCont contp, TSEvent event ATS_UNUSED, void *edata)
lua_getglobal(l, TS_LUA_FUNCTION_G_POST_REMAP);
break;
- case TS_EVENT_HTTP_SELECT_ALT:
- lua_getglobal(l, TS_LUA_FUNCTION_G_SELECT_ALT);
- break;
-
case TS_EVENT_HTTP_OS_DNS:
lua_getglobal(l, TS_LUA_FUNCTION_G_OS_DNS);
break;
@@ -550,13 +546,6 @@ TSPluginInit(int argc, const char *argv[])
}
lua_pop(l, 1);
- lua_getglobal(l, TS_LUA_FUNCTION_G_SELECT_ALT);
- if (lua_type(l, -1) == LUA_TFUNCTION) {
- TSHttpHookAdd(TS_HTTP_SELECT_ALT_HOOK, global_contp);
- TSDebug(TS_LUA_DEBUG_TAG, "select_alt_hook added");
- }
- lua_pop(l, 1);
-
lua_getglobal(l, TS_LUA_FUNCTION_G_OS_DNS);
if (lua_type(l, -1) == LUA_TFUNCTION) {
TSHttpHookAdd(TS_HTTP_OS_DNS_HOOK, global_contp);
diff --git a/plugins/experimental/ts_lua/ts_lua_common.h b/plugins/experimental/ts_lua/ts_lua_common.h
index 12654b6..fa1baeb 100644
--- a/plugins/experimental/ts_lua/ts_lua_common.h
+++ b/plugins/experimental/ts_lua/ts_lua_common.h
@@ -44,7 +44,6 @@
#define TS_LUA_FUNCTION_PRE_REMAP "do_pre_remap"
#define TS_LUA_FUNCTION_POST_REMAP "do_post_remap"
#define TS_LUA_FUNCTION_OS_DNS "do_os_dns"
-#define TS_LUA_FUNCTION_SELECT_ALT "do_select_alt"
#define TS_LUA_FUNCTION_READ_CACHE "do_read_cache"
#define TS_LUA_FUNCTION_TXN_CLOSE "do_txn_close"
@@ -57,7 +56,6 @@
#define TS_LUA_FUNCTION_G_PRE_REMAP "do_global_pre_remap"
#define TS_LUA_FUNCTION_G_POST_REMAP "do_global_post_remap"
#define TS_LUA_FUNCTION_G_OS_DNS "do_global_os_dns"
-#define TS_LUA_FUNCTION_G_SELECT_ALT "do_global_select_alt"
#define TS_LUA_FUNCTION_G_READ_CACHE "do_global_read_cache"
#define TS_LUA_FUNCTION_G_TXN_CLOSE "do_global_txn_close"
diff --git a/plugins/experimental/ts_lua/ts_lua_hook.c b/plugins/experimental/ts_lua/ts_lua_hook.c
index 8a6e7b4..81e3298 100644
--- a/plugins/experimental/ts_lua/ts_lua_hook.c
+++ b/plugins/experimental/ts_lua/ts_lua_hook.c
@@ -31,7 +31,6 @@ typedef enum {
TS_LUA_HOOK_PRE_REMAP,
TS_LUA_HOOK_POST_REMAP,
TS_LUA_HOOK_OS_DNS,
- TS_LUA_HOOK_SELECT_ALT,
TS_LUA_HOOK_READ_CACHE_HDR,
TS_LUA_HOOK_TXN_CLOSE,
TS_LUA_REQUEST_TRANSFORM,
@@ -49,7 +48,6 @@ char *ts_lua_hook_id_string[] = {"TS_LUA_HOOK_DUMMY",
"TS_LUA_HOOK_PRE_REMAP",
"TS_LUA_HOOK_POST_REMAP",
"TS_LUA_HOOK_OS_DNS",
- "TS_LUA_HOOK_SELECT_ALT",
"TS_LUA_HOOK_READ_CACHE_HDR",
"TS_LUA_HOOK_TXN_CLOSE",
"TS_LUA_REQUEST_TRANSFORM",
@@ -205,18 +203,6 @@ ts_lua_add_hook(lua_State *L)
}
break;
- case TS_LUA_HOOK_SELECT_ALT:
- if (http_ctx) {
- TSHttpTxnHookAdd(http_ctx->txnp, TS_HTTP_SELECT_ALT_HOOK, http_ctx->cinfo.contp);
- http_ctx->has_hook = 1;
- lua_pushvalue(L, 2);
- lua_setglobal(L, TS_LUA_FUNCTION_SELECT_ALT);
- } else {
- lua_pushvalue(L, 2);
- lua_setglobal(L, TS_LUA_FUNCTION_G_SELECT_ALT);
- }
- break;
-
case TS_LUA_HOOK_READ_CACHE_HDR:
if (http_ctx) {
TSHttpTxnHookAdd(http_ctx->txnp, TS_HTTP_READ_CACHE_HDR_HOOK, http_ctx->cinfo.contp);
diff --git a/plugins/experimental/ts_lua/ts_lua_util.c b/plugins/experimental/ts_lua/ts_lua_util.c
index 58dabdc..159c86c 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.c
+++ b/plugins/experimental/ts_lua/ts_lua_util.c
@@ -762,15 +762,6 @@ ts_lua_http_cont_handler(TSCont contp, TSEvent ev, void *edata)
break;
- case TS_EVENT_HTTP_SELECT_ALT:
-
- lua_getglobal(L, TS_LUA_FUNCTION_SELECT_ALT);
- if (lua_type(L, -1) == LUA_TFUNCTION) {
- ret = lua_resume(L, 0);
- }
-
- break;
-
case TS_EVENT_HTTP_READ_CACHE_HDR:
lua_getglobal(L, TS_LUA_FUNCTION_READ_CACHE);
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].