From d94775e1f9a9239a823b9aa52d754f9ec2635e6d Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Fri, 28 May 2010 21:11:24 +0200 Subject: [PATCH] git-instaweb: Wait for server to start before running web browser Add generic httpd_is_ready subroutine, which busy-waits for web server to be started, by checking if $port is opened on localhost. This is used to avoid situation where web browser is started before web server is ready to accept connection, and fails. It uses IO::Socket::INET module, which is core Perl module since v5.6.0. Alternate solution, possible for those web servers that can run arbitrary code hooks after they bind the listen socket (after they start accepting connections), would be to use some kind of blocking mechanism: FIFO or lockfile, see http://thread.gmane.org/gmane.comp.version-control.git/147337/focus=147566 This can be always added later, as a web server specific branch in httpd_is_ready function. Signed-off-by: Jakub Narebski Acked-by: Petr Baudis Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- git-instaweb.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/git-instaweb.sh b/git-instaweb.sh index a8c5dc0ee..dc8478f1f 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -117,6 +117,19 @@ stop_httpd () { rm -f "$fqgitdir/pid" } +httpd_is_ready () { + "$PERL" -MIO::Socket::INET -e " +local \$| = 1; # turn on autoflush +exit if (IO::Socket::INET->new('127.0.0.1:$port')); +print 'Waiting for \'$httpd\' to start ..'; +do { + print '.'; + sleep(1); +} until (IO::Socket::INET->new('127.0.0.1:$port')); +print qq! (done)\n!; +" +} + while test $# != 0 do case "$1" in @@ -414,7 +427,7 @@ start_httpd url=http://127.0.0.1:$port if test -n "$browser"; then - git web--browse -b "$browser" $url || echo $url + httpd_is_ready && git web--browse -b "$browser" $url || echo $url else - git web--browse -c "instaweb.browser" $url || echo $url + httpd_is_ready && git web--browse -c "instaweb.browser" $url || echo $url fi -- 2.30.2