chore: clean up code

This commit is contained in:
gVisor bot 2023-03-29 16:19:26 +08:00
parent 380b3eaa0d
commit a461d29a84
2 changed files with 2 additions and 44 deletions

View File

@ -47,7 +47,7 @@ func restart(w http.ResponseWriter, r *http.Request) {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
err = cmd.Start() err = cmd.Start()
if err != nil { if err != nil {
log.Fatalln("restarting:: %s", err) log.Fatalln("restarting: %s", err)
} }
os.Exit(0) os.Exit(0)

View File

@ -1,18 +1,12 @@
package route package route
import ( import (
"fmt"
"net/http" "net/http"
"os"
"os/exec"
"runtime"
"syscall"
"github.com/Dreamacro/clash/hub/updater" "github.com/Dreamacro/clash/hub/updater"
"github.com/Dreamacro/clash/log" "github.com/Dreamacro/clash/log"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/go-chi/render"
) )
func upgradeRouter() http.Handler { func upgradeRouter() http.Handler {
@ -30,41 +24,5 @@ func upgrade(w http.ResponseWriter, r *http.Request) {
return return
} }
execPath, err := os.Executable() restart(w, r)
if err != nil {
render.Status(r, http.StatusInternalServerError)
render.JSON(w, r, newError(fmt.Sprintf("getting path: %s", err)))
return
}
render.JSON(w, r, render.M{"status": "ok"})
if f, ok := w.(http.Flusher); ok {
f.Flush()
}
// modify from https://github.com/AdguardTeam/AdGuardHome/blob/595484e0b3fb4c457f9bb727a6b94faa78a66c5f/internal/home/controlupdate.go#L180
// The background context is used because the underlying functions wrap it
// with timeout and shut down the server, which handles current request. It
// also should be done in a separate goroutine for the same reason.
go func() {
if runtime.GOOS == "windows" {
cmd := exec.Command(execPath, os.Args[1:]...)
log.Infoln("restarting: %q %q", execPath, os.Args[1:])
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Start()
if err != nil {
log.Fatalln("restarting: %s", err)
}
os.Exit(0)
}
log.Infoln("restarting: %q %q", execPath, os.Args[1:])
err = syscall.Exec(execPath, os.Args, os.Environ())
if err != nil {
log.Fatalln("restarting: %s", err)
}
}()
} }