mirror of
				https://github.com/openresty/openresty.git
				synced 2024-10-13 00:29:41 +00:00 
			
		
		
		
	change: dist-check: close nginx using PID file instead of killall. (#916)
This commit is contained in:
		| @ -86,7 +86,7 @@ sh "sudo $make install"; | ||||
| sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep -v 'stream_proxy'"; | ||||
| #system "sudo killall nginx > /dev/null 2>&1"; | ||||
| #system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| sh "curl -si localhost/lua|grep $lua"; | ||||
| sh "curl -si localhost/lua|grep $ver"; | ||||
| @ -108,7 +108,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop"; | ||||
| #sh "$prefix/nginx/sbin/nginx -V 2>\&1", $ver; | ||||
| #sh "$prefix/nginx/sbin/nginx -V 2>\&1", "--with-stream", 1; | ||||
| #sh "$prefix/nginx/sbin/nginx -V 2>\&1", "--with-dtrace-probes"; | ||||
| #system "sudo killall nginx > /dev/null 2>&1"; | ||||
| #system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| #sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| #sh "curl -si localhost/lua|grep $lua"; | ||||
| #sh "curl -si localhost/lua|grep $ver"; | ||||
| @ -129,7 +129,7 @@ sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--without-http_gzip_module'"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep -v -q '\\--with-http_ssl_module'"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--without-pcre'"; | ||||
| system "sudo killall nginx > /dev/null 2>&1"; | ||||
| system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| if (0) { | ||||
| sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| sh "curl -si localhost/lua|grep $lua"; | ||||
| @ -152,7 +152,7 @@ sh "sudo $make install"; | ||||
| sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-threads'"; | ||||
| system "sudo killall nginx > /dev/null 2>&1"; | ||||
| system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| sh "curl -si localhost/lua|grep $lua"; | ||||
| sh "curl -si localhost/lua|grep $ver"; | ||||
| @ -171,7 +171,7 @@ sh "sudo $make install > /dev/null"; | ||||
| sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; | ||||
| #sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-no-pool-patch'"; | ||||
| system "sudo killall nginx > /dev/null 2>&1"; | ||||
| system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| sh "curl -si localhost/lua|grep $lua"; | ||||
| sh "curl -si localhost/lua|grep $ver"; | ||||
| @ -190,7 +190,7 @@ sh "$make -j$jobs"; | ||||
| sh "sudo $make install"; | ||||
| sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; | ||||
| system "sudo killall nginx > /dev/null 2>&1"; | ||||
| system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| sh "curl -si localhost/lua|grep $lua"; | ||||
| sh "curl -si localhost/lua|grep $ver"; | ||||
| @ -215,7 +215,7 @@ sh "sudo $make install"; | ||||
| sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; | ||||
| sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-debug'"; | ||||
| system "sudo killall nginx > /dev/null 2>&1"; | ||||
| system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| sh "curl -si localhost/lua|grep $lua"; | ||||
| sh "curl -si localhost/lua|grep $ver"; | ||||
| @ -234,7 +234,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop"; | ||||
| #sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf"; | ||||
| #sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver"; | ||||
| #sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'"; | ||||
| #system "sudo killall nginx > /dev/null 2>&1"; | ||||
| #system "[ -f '$prefix/nginx/logs/nginx.pid' ] && sudo kill \$(cat '$prefix/nginx/logs/nginx.pid') > /dev/null 2>&1"; | ||||
| #sh "sudo $prefix/nginx/sbin/nginx"; | ||||
| #sh "curl -si localhost/lua|grep $lua"; | ||||
| #sh "curl -si localhost/lua|grep $ver"; | ||||
|  | ||||
		Reference in New Issue
	
	Block a user