Skip to content

Commit 49f73a8

Browse files
AlinsRannic-6443
andauthored
chore: remove grpc client (#415)
Signed-off-by: Nic <[email protected]> Co-authored-by: Nic <[email protected]>
1 parent 247504b commit 49f73a8

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.6
1+
1.1.7

build-api7ee-runtime.sh

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ mod_dubbo_ver="1.0.2"
2727
apisix_nginx_module_ver="1.16.3"
2828
wasm_nginx_module_ver="0.6.5"
2929
lua_var_nginx_module_ver="v0.5.3"
30-
grpc_client_nginx_module_ver="v0.4.4"
3130
lua_resty_events_ver="0.2.0"
3231

3332

@@ -130,14 +129,6 @@ else
130129
lua-var-nginx-module-${lua_var_nginx_module_ver}
131130
fi
132131

133-
if [ "$repo" == grpc-client-nginx-module ]; then
134-
cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
135-
else
136-
git clone --depth=1 -b $grpc_client_nginx_module_ver \
137-
https://github.com/api7/grpc-client-nginx-module \
138-
grpc-client-nginx-module-${grpc_client_nginx_module_ver}
139-
fi
140-
141132
cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
142133
./patch.sh ../openresty-${OPENRESTY_VERSION}
143134
cd ..
@@ -152,9 +143,6 @@ cd ..
152143

153144
luajit_xcflags=${luajit_xcflags:="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT"}
154145
no_pool_patch=${no_pool_patch:-}
155-
# TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
156-
# version of grpc-client-nginx-module
157-
grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"
158146

159147
cd openresty-${OPENRESTY_VERSION} || exit 1
160148

@@ -181,7 +169,7 @@ fi
181169

182170

183171
./configure --prefix="$OR_PREFIX" \
184-
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \
172+
--with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt" \
185173
--with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
186174
$debug_args \
187175
--add-module=../mod_dubbo-${mod_dubbo_ver} \
@@ -191,7 +179,6 @@ fi
191179
--add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
192180
--add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
193181
--add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
194-
--add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
195182
--add-module=../lua-resty-events-${lua_resty_events_ver} \
196183
--with-poll_module \
197184
--with-pcre-jit \
@@ -223,6 +210,10 @@ fi
223210
$no_pool_patch \
224211
-j`nproc`
225212

213+
# ref: https://github.com/api7/grpc-client-nginx-module/pull/34
214+
# After loading Go code from .so, the signalfd doesn't work anymore
215+
sed -i "s/#ifndef NGX_HTTP_LUA_HAVE_SIGNALFD/#ifdef NGX_HTTP_LUA_HAVE_SIGNALFD/" $(find -name 'ngx_auto_config.h')
216+
226217
make -j`nproc`
227218
sudo make install
228219
cd ..
@@ -242,10 +233,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
242233
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
243234
cd ..
244235

245-
cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
246-
sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
247-
cd ..
248-
249236
# package etcdctl
250237
ETCD_ARCH="amd64"
251238
ETCD_VERSION=${ETCD_VERSION:-'3.5.4'}

0 commit comments

Comments
 (0)