Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg/server: use correct recovery mode on restart 

Use correct camlistored recovery flag values 0,1,2 as optional
selection values when restarting from the WebUI status page.

Fixes #1071

Change-Id: Ia537e412290e2b954fb6c604a24b9ffef70acde7
This commit is contained in:
Peter Etelej 2018-03-04 09:57:21 +03:00
parent 974d8aa8a4
commit 52d0e5f040
No known key found for this signature in database
GPG Key ID: C19A90B496F44BEB
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/server/status.go
View File

@ -28,6 +28,7 @@ import (
"reflect"
"regexp"
"runtime"
"strconv"
"strings"
"time"
@ -260,8 +261,13 @@ func (sh *StatusHandler) serveStatusHTML(rw http.ResponseWriter, req *http.Reque
f("<h2>Admin</h2>")
f("<ul>")
f(" <li><form method='post' action='restart' onsubmit='return confirm(\"Really restart now?\")'><button>restart server</button>")
f("<input type='checkbox' name='reindex'> reindex <input type='checkbox' name='recovery'> recovery</form></li>")
f(" <li><form method='post' action='restart' onsubmit='return confirm(\"Really restart now?\")'><button>restart server</button> ")
f("<input type='checkbox' name='reindex' id='reindex'><label for='reindex'> reindex </label>")
f("<select name='recovery'><option selected='true' disabled='disabled'>select recovery mode</option>")
f("<option value='0'>no recovery</option>")
f("<option value='1'>fast recovery</option>")
f("<option value='2'>full recovery</option>")
f("</select>")
f("</form></li>")
if env.OnGCE() {
console, err := sh.googleCloudConsole()
@ -314,7 +320,7 @@ func (sh *StatusHandler) serveRestart(rw http.ResponseWriter, req *http.Request)
}
reindex := (req.FormValue("reindex") == "on")
recovery := (req.FormValue("recovery") == "on")
recovery, _ := strconv.Atoi(req.FormValue("recovery"))
log.Println("Restarting camlistored")
rw.Header().Set("Connection", "close")
@ -322,7 +328,7 @@ func (sh *StatusHandler) serveRestart(rw http.ResponseWriter, req *http.Request)
if f, ok := rw.(http.Flusher); ok {
f.Flush()
}
osutil.RestartProcess(fmt.Sprintf("-reindex=%t", reindex), fmt.Sprintf("-recovery=%t", recovery))
osutil.RestartProcess(fmt.Sprintf("-reindex=%t", reindex), fmt.Sprintf("-recovery=%d", recovery))
}
var cgoEnabled bool