Commit8314791

Felipe Zimmerle

committed

test: nginx: Adds timeout while listening for a socket.

1 parent215042a commit8314791Copy full SHA for 8314791

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -387,6 +387,9 @@ sub do_raw_request {`
`387`	`387`	`)or msg("Failed to connect to localhost:$opt{p}:$@");`
`388`	`388`	`returnunless ($sock);`
`389`	`389`
	`390`	`+my$timeo =pack("qq", 2, 0);`
	`391`	`+$sock->sockopt(SO_RCVTIMEO,$timeo);`
	`392`	`+`
`390`	`393`	`# Join togeather the request`
`391`	`394`	`my$r =join("",@_);`
`392`	`395`	`dbg($r);`
`@@ -777,7 +780,7 @@ sub nginx_start {`
`777`	`780`	`}`
`778`	`781`
`779`	`782`	`# Look for startup msworker cycleg`
`780`		`-unless (defined match_log("error",qr/setproctitle: "nginx:worker process"/, 60,"worker cycle")) {`
	`783`	`+unless (defined match_log("error",qr/startworker process/, 60)) {`
`781`	`784`	`vrb(join("",map { quote_shell($_) }@p));`
`782`	`785`	`msg("Nginx server failed to start.");`
`783`	`786`	`nginx_stop();`

Comments

(0)