history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: merge branch 'with-tun' into plus-pro

Browse Source
This commit is contained in:
yaling888
2022-06-06 03:22:48 +08:00
parent c8e2b30540 c1821e28d3
commit e03f1d0565
15 changed files with 144 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hub/route/configs.go
View File

@ -169,13 +169,13 @@ func updateConfigs(w http.ResponseWriter, r *http.Request) {
var err error
if req.Payload != "" {
log.Warnln("[REST-API] update config by payload")
cfg, err = executor.ParseWithBytes([]byte(req.Payload))
if err != nil {
render.Status(r, http.StatusBadRequest)
render.JSON(w, r, newError(err.Error()))
return
}
log.Warnln("[REST-API] update config by payload")
} else {
if req.Path == "" {
req.Path = constant.Path.Config()
@ -186,13 +186,13 @@ func updateConfigs(w http.ResponseWriter, r *http.Request) {
return
}
log.Warnln("[REST-API] reload config from path: %s", req.Path)
cfg, err = executor.ParseWithPath(req.Path)
if err != nil {
render.Status(r, http.StatusBadRequest)
render.JSON(w, r, newError(err.Error()))
return
}
log.Warnln("[REST-API] reload config from path: %s", req.Path)
}
executor.ApplyConfig(cfg, force)