Merge branch 'pr/683'

* pr/683: Restart monitor as part of the upgrade process (fixes #682)
2014-09-14 23:18:48 +02:00
parent 2927de7cf9 a5e3317e28
commit 517b7a14b4
3 changed files with 16 additions and 1 deletions
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -531,7 +531,9 @@ func restPostUpgrade(w http.ResponseWriter, r *http.Request) {
 			return
 		}

-		restPostRestart(w, r)
+		flushResponse(`{"ok": "restarting"}`, w)
+		l.Infoln("Upgrading")
+		stop <- exitUpgrading
 	}
 }