Skip to content

Commit

Permalink
instaweb: restart server if already running
Browse files Browse the repository at this point in the history
Running 'git instaweb' when an instaweb server is already running will
fail (at least when the port is the same) and overwrite the pid file
used to track the currently running server. This turns out to be
especially annoying when the user tries to stop the previously running
server with 'git instaweb --stop' and is instead greeted with an error
message because the pid file has been destroyed.

Instead of allowing a user to start two instaweb servers, stop the
currently running server first and then start the new one. This should
be fine because it was never really possible to start two instaweb
servers in the first place due to the pid file issue outlined above.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
bebarino authored and gitster committed Nov 24, 2009
1 parent 1ddf5ef commit 0b624b4
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions git-instaweb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ resolve_full_httpd () {
}

start_httpd () {
if test -f "$fqgitdir/pid"; then
say "Instance already running. Restarting..."
stop_httpd
fi

# here $httpd should have a meaningful value
resolve_full_httpd

Expand Down

0 comments on commit 0b624b4

Please sign in to comment.