Commit d852118

committed

nginx 错误提示更新;日志压缩使用 xz 命令;安装脚本小调整

2 parents 8a3fb1d + a73cb9d commit d852118Copy full SHA for d852118

5 files changed

Lines changed: 54 additions & 28 deletions

File tree

api.conf
i.sh
log-svc
- backup.sh
lua
- http-enc-res-hdr.lua
nginx.conf

`‎api.conf‎`

Lines changed: 26 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,3 @@`
`1`		`-if ($_origin_id = '') {`
`2`		- return 403 'ERROR: origin `$http_origin` is not allowed';
`3`		`-}`
`4`		`-if ($http_x_jsproxy) {`
`5`		`- return 500 'ERROR: circular dependency';`
`6`		`-}`
`7`		`-proxy_set_header x-jsproxy 1;`
`8`		`-proxy_set_header Connection $http_connection;`
`9`		`-`
`10`	`1`	`set $_level '';`
`11`	`2`	`set $_switched '';`
`12`	`3`	`set $_url '';`
`@@ -16,6 +7,20 @@ set $_type '';`
`16`	`7`	`set $_mode '';`
`17`	`8`	`set $_bodyhash '';`
`18`	`9`
	`10`	`+error_page 500 502 504 /error;`
	`11`	`+`
	`12`	`+location = /error {`
	`13`	`+ internal;`
	`14`	`+ access_log off;`
	`15`	`+ more_set_headers`
	`16`	`+ 'access-control-allow-origin: *'`
	`17`	`+ 'access-control-expose-headers: gateway-err--'`
	`18`	`+ 'gateway-err--: {"msg": "$arg_msg", "addr": "$upstream_addr"}'`
	`19`	`+ ;`
	`20`	`+ return 200;`
	`21`	`+}`
	`22`	`+`
	`23`	`+`
`19`	`24`	`location = /preflight {`
`20`	`25`	`internal;`
`21`	`26`	`access_log off;`
`@@ -31,8 +36,19 @@ location = /preflight {`
`31`	`36`
`32`	`37`	`# HTTP(S) Proxy`
`33`	`38`	`location = /http {`
	`39`	`+ # see ./allowed-sites.conf`
	`40`	`+ if ($_origin_id = '') {`
	`41`	`+ rewrite ^ /error?msg=ORIGIN_NOT_ALLOWED;`
	`42`	`+ }`
	`43`	`+ if ($http_x_jsproxy) {`
	`44`	`+ rewrite ^ /error?msg=CIRCULAR_DEPENDENCY;`
	`45`	`+ }`
	`46`	`+ proxy_set_header x-jsproxy 1;`
	`47`	`+ proxy_set_header Connection $http_connection;`
	`48`	`+`
	`49`	`+`
`34`	`50`	`if ($http_access_control_request_headers) {`
`35`		`- rewrite ^ /preflight;`
	`51`	`+ rewrite ^ /preflight;`
`36`	`52`	`}`
`37`	`53`
`38`	`54`	`access_by_lua_file ../lua/http-dec-req-hdr.lua;`

`‎i.sh‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ gen_cert() {`
`57`	`57`	`ip=$(curl -s $i)`
`58`	`58`
`59`	`59`	`if [[ ! $ip ]]; then`
`60`		`- warn "获取失败"`
	`60`	`+ warn "获取失败"`
`61`	`61`	`continue`
`62`	`62`	`fi`
`63`	`63`
`@@ -179,7 +179,7 @@ install() {`
`179`	`179`	`fi`
`180`	`180`
`181`	`181`	`if [ -d server ]; then`
`182`		`- backup="$INSTALL_DIR/bak/$(date +%Y_%m_%d_%H_%M_%S)"`
	`182`	`+ localbackup="$INSTALL_DIR/bak/$(date +%Y_%m_%d_%H_%M_%S)"`
`183`	`183`	`warn "当前 server 目录备份到 $backup"`
`184`	`184`	`mkdir -p $backup`
`185`	`185`	`mv server $backup`

`‎log-svc/backup.sh‎`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,13 @@`
`3`	`3`
`4`	`4`	`SVC_DIR=/home/jsproxy/server`
`5`	`5`	`LOG_DIR=$SVC_DIR/nginx/logs`
	`6`	`+DST_DIR=$SVC_DIR/log-svc/backup`
`6`	`7`
`7`	`8`	`LOG_FILE=$LOG_DIR/proxy.log`
`8`		`-LOG_SIZE=$(( 32 * 1024 * 1024 ))`
	`9`	`+LOG_SIZE=$(( 256 * 1024 * 1024 ))`
`9`	`10`
`10`	`11`	`ERR_FILE=$LOG_DIR/error.log`
`11`		`-ERR_SIZE=$(( 11024 1024 * 1024 ))`
	`12`	`+ERR_SIZE=$(( 256 * 1024 * 1024 ))`
`12`	`13`
`13`	`14`
`14`	`15`	`# error.log 达到 ERR_SIZE,开始备份(目前只清理)`
`@@ -24,24 +25,21 @@ if (( $logsize < $LOG_SIZE )); then`
`24`	`25`	`fi`
`25`	`26`
`26`	`27`	`logtime=$(date "+%Y-%m-%d-%H-%M-%S")`
`27`		`-logfile=$SVC_DIR/log-svc/backup/$logtime.log`
`28`	`28`
`29`	`29`	`#`
`30`	`30`	`# 先移走日志文件,然后创建新的日志文件,通知 nginx 重新打开`
`31`	`31`	`#`
`32`		`-mv $LOG_FILE $logfile`
	`32`	`+mv $LOG_FILE $DST_DIR/$logtime.log`
`33`	`33`	`touch $LOG_FILE`
`34`	`34`	`$SVC_DIR/run.sh reopen`
`35`	`35`	`sleep 1`
`36`	`36`
`37`	`37`	`#`
`38`	`38`	`# 日志压缩`
`39`	`39`	`# 根据实际情况调整策略,在不影响系统的前提下,充分利用剩余 CPU`
`40`		`-# 可尝试其他工具(例如 7z),在开销和效果之间找一个平衡点`
`41`	`40`	`#`
`42`		`-echo "compress $logtime ($logsize bytes)"`
	`41`	`+echo "compress ..."`
`43`	`42`
`44`		`-nice -n 19 \`
`45`		`- gzip $logfile`
	`43`	`+nice -n 19 xz $DST_DIR/*.log`
`46`	`44`
`47`	`45`	`echo "done"`

`‎lua/http-enc-res-hdr.lua‎`

Lines changed: 17 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,27 @@ end`
`23`	`23`
`24`	`24`	`local function flushHdr()`
`25`	`25`	`if detail then`
`26`		`- expose = expose .. ',--s'`
	`26`	`+ if status ~= 200 then`
	`27`	`+ expose = expose .. ',--s'`
	`28`	`+ end`
`27`	`29`	`-- 该字段不在 aceh 中,如果浏览器能读取到,说明支持 * 通配`
`28`	`30`	`ngx.header['--t'] = '1'`
`29`	`31`	`end`
`30`	`32`
`31`		`- local status = ngx.status`
`32`		`-`
`33`	`33`	`ngx.header['access-control-expose-headers'] = expose`
`34`	`34`	`ngx.header['access-control-allow-origin'] = '*'`
`35`	`35`	`ngx.header['vary'] = vary`
`36`		`- ngx.header['--s'] = status`
	`36`	`+`
	`37`	`+ local status = ngx.status`
	`38`	`+`
	`39`	`+ -- 前端优先使用该字段作为状态码`
	`40`	`+ if status ~= 200 then`
	`41`	`+ ngx.header['--s'] = status`
	`42`	`+ end`
	`43`	`+`
	`44`	`+ -- 保留原始状态码,便于控制台调试`
	`45`	`+ -- 例如 404 显示红色,如果统一设置成 200 则没有颜色区分`
	`46`	`+ -- 需要转义 30X 重定向,否则不符合 cors 标准`
`37`	`47`	`if`
`38`	`48`	`status == 301 or`
`39`	`49`	`status == 302 or`
`@@ -112,9 +122,9 @@ local function nodeSwitched()`
`112`	`122`	`end`
`113`	`123`
`114`	`124`	`-- 节点切换功能,目前还在测试中(demo 中已开启)`
`115`		`---if nodeSwitched() then`
`116`		`--- return`
`117`		`---end`
	`125`	`+if nodeSwitched() then`
	`126`	`+ return`
	`127`	`+end`
`118`	`128`
`119`	`129`
`120`	`130`	`local h, err = ngx.resp.get_headers()`

`‎nginx.conf‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,9 @@ http {`
`45`	`45`	`proxy_buffer_size 16k;`
`46`	`46`	`proxy_buffers 4 32k;`
`47`	`47`	`proxy_busy_buffers_size 64k;`
`48`		`- proxy_send_timeout 10s;`
	`48`	`+ proxy_send_timeout 30s;`
	`49`	`+ proxy_read_timeout 30s;`
	`50`	`+ proxy_connect_timeout 10s;`
`49`	`51`
`50`	`52`	`lua_load_resty_core off;`
`51`	`53`

0 commit comments

Comments

(0)