Mercurial > hg > nginx-tests
diff stream_error_log.t @ 816:77359b849cd5
Tests: stream package.
author | Andrey Zelenkov <zelenkov@nginx.com> |
---|---|
date | Mon, 20 Jul 2015 15:06:09 +0300 |
parents | 22bade4c7e12 |
children | 6bb1f2ccd386 |
line wrap: on
line diff
--- a/stream_error_log.t +++ b/stream_error_log.t @@ -18,6 +18,7 @@ BEGIN { use FindBin; chdir($FindBin::Bin use lib 'lib'; use Test::Nginx; +use Test::Nginx::Stream qw/ stream /; ############################################################################### @@ -87,7 +88,7 @@ open STDERR, ">&", \*OLDERR; ############################################################################### -stream_get('data'); +stream()->io('data'); # error_log levels @@ -163,62 +164,6 @@ sub levels { return \%levels_hash; } -sub stream_get { - my ($data, $peer) = @_; - - $peer = '127.0.0.1:8080' unless defined $peer; - my $s = stream_connect($peer); - stream_write($s, $data); - - $data = ''; - while (my $buf = stream_read($s)) { - $data .= $buf; - } - return $data; -} - -sub stream_connect { - my $peer = shift; - my $s = IO::Socket::INET->new( - Proto => 'tcp', - PeerAddr => $peer || '127.0.0.1:8080' - ) - or die "Can't connect to nginx: $!\n"; - - return $s; -} - -sub stream_write { - my ($s, $message) = @_; - - local $SIG{PIPE} = 'IGNORE'; - - $s->blocking(0); - while (IO::Select->new($s)->can_write(1.5)) { - my $n = $s->syswrite($message); - last unless $n; - $message = substr($message, $n); - last unless length $message; - } - - if (length $message) { - $s->close(); - } -} - -sub stream_read { - my ($s) = @_; - my ($buf); - - $s->blocking(0); - if (IO::Select->new($s)->can_read(5)) { - $s->sysread($buf, 1024); - }; - - log_in($buf); - return $buf; -} - sub get_syslog { my ($data, $peer, $port) = @_; my ($s); @@ -242,7 +187,7 @@ sub get_syslog { return undef; } - stream_get($data, $peer); + stream($peer)->io($data); $data = ''; IO::Select->new($s)->can_read(1.5);