From 4143173cd08ef515173e5ad4b4c15d4e9f9f1943 Mon Sep 17 00:00:00 2001 From: HuabingZhao Date: Wed, 17 Aug 2016 12:37:07 +0800 Subject: 1. Adjust the directory hierarchy 2. Fix the compile issue Change-Id: Ibf10c83104e5e673bc797013799861426cd950ce Signed-off-by: HuabingZhao --- .../openresty/nginx/luaext/lib/tools/db_cache.lua | 54 -------------------- .../openresty/nginx/luaext/lib/utils/log_util.lua | 28 ---------- .../openresty/nginx/luaext/lib/utils/svc_util.lua | 59 ---------------------- .../nginx/luaext/lib/utils/table_util.lua | 30 ----------- 4 files changed, 171 deletions(-) delete mode 100644 openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/tools/db_cache.lua delete mode 100644 openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/log_util.lua delete mode 100644 openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/svc_util.lua delete mode 100644 openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/table_util.lua (limited to 'openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib') diff --git a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/tools/db_cache.lua b/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/tools/db_cache.lua deleted file mode 100644 index 7f40590..0000000 --- a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/tools/db_cache.lua +++ /dev/null @@ -1,54 +0,0 @@ ---[[ - - Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---]] - --- db cache over LRUCache， used within one worker processes -local _M = {} -_M._VERSION = '1.0.0' - -local lrucache = require "resty.lrucache" - -local EMPTY_DATA = '_EMPTY_' - --- we need to initialize the cache on the lua module level so that --- it can be shared by all the requests served by each nginx worker process: -local cache,err = lrucache.new(200) -- allow up to 200 items in the cache -if not cache then - return ngx.log(ngx.ERR,"failed to create the cache: " .. (err or "unknown")) -end - -function _M.get(key) - return cache:get(key) -end - -function _M.set(key,value) - return _M:set(key, value, nil) -end - -function _M.set(key,value,ttl) - if not value then - value = EMPTY_DATA - end - return cache:set(key, value, ttl) -end - --- check if the data returned by get() is considered empty -function _M.is_empty(data) - return data == EMPTY_DATA -end - -return _M \ No newline at end of file diff --git a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/log_util.lua b/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/log_util.lua deleted file mode 100644 index 67b0e26..0000000 --- a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/log_util.lua +++ /dev/null @@ -1,28 +0,0 @@ ---[[ - - Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---]] - -local _M = {} -_M._VERSION = '1.0.0' - -function _M.log(k, v) - --if empty,initialize it - if not ngx.ctx.logtbl then ngx.ctx.logtbl = {} end - ngx.ctx.logtbl[k] = v -end - -return _M \ No newline at end of file diff --git a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/svc_util.lua b/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/svc_util.lua deleted file mode 100644 index 224b321..0000000 --- a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/svc_util.lua +++ /dev/null @@ -1,59 +0,0 @@ ---[[ - - Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---]] - -local _M = {} -_M._VERSION = '1.0.0' - -local tbl_util = require('lib.utils.table_util') -local msbConf= require('conf.msbinit') -local log_util = require('lib.utils.log_util') -local tbl_isempty = tbl_util.isempty -local enableauthcheck = msbConf.systemConf.enableauthcheck -local log = log_util.log - -function _M.isactive(svcinfo) - if tbl_isempty(svcinfo) then - return false - end - if svcinfo["status"] == "1" then - return true - else - return false - end -end - -function _M.isautodiscover(svcinfo) - if tbl_isempty(svcinfo) then - return false - end - if svcinfo["autoDiscover"] == "1" then - return true - else - return false - end -end - -function _M.setauthheader(svcinfo) - --if auth check enabled and this service is inter-system then add sth - if enableauthcheck and svcinfo["visualRange"] == "0" then - ngx.req.set_header("Z-EXTENT", "C012089CF43DE687B23B2C0176B344EE") - log("add Z-EXTENT",true) - end -end - -return _M \ No newline at end of file diff --git a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/table_util.lua b/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/table_util.lua deleted file mode 100644 index c1ddbfe..0000000 --- a/openresty-ext/src/assembly/resources/openresty/nginx/luaext/lib/utils/table_util.lua +++ /dev/null @@ -1,30 +0,0 @@ ---[[ - - Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---]] - -local _M = {} -_M._VERSION = '1.0.0' - -function _M.isempty(t) - if t == nil or next(t) == nil then - return true - else - return false - end -end - -return _M \ No newline at end of file -- cgit 1.2.3-korg