From 0b624b4ceee63ce45135cdbb80f2807c20b48646 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Sun, 22 Nov 2009 23:09:12 -0800 Subject: [PATCH] instaweb: restart server if already running 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 Signed-off-by: Junio C Hamano --- git-instaweb.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git-instaweb.sh b/git-instaweb.sh index d96eddbe56..80a7f74fea 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -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