Explorar o código

change reload to map

i don`t like to use sleep, it is not good for a program
rufengsuixing %!s(int64=5) %!d(string=hai) anos
pai
achega
ffccccb5e7

+ 2 - 3
luasrc/model/cbi/AdGuardHome/base.lua

@@ -118,9 +118,8 @@ o.default     = ""
 o.datatype    = "string"
 o.template = "AdGuardHome/AdGuardHome_chpass"
 
-local apply = luci.http.formvalue("cbi.apply")
- if apply then
-     io.popen("sleep 1 ;/etc/init.d/AdGuardHome reload &")
+function mp.on_commit(map)
+	io.popen("/etc/init.d/AdGuardHome reload &")
 end
 
 return mp

+ 5 - 2
luasrc/model/cbi/AdGuardHome/manual.lua

@@ -54,10 +54,11 @@ o.validate=function(self, value)
 	else
 		return value
 	end
+	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome","manual"))
+	return nil
 end
 o.write = function(self, section, value)
 	NXFS.move("/tmp/AdGuardHometmpconfig.yaml",escconf)
-	io.popen("sleep 1 ;/etc/init.d/AdGuardHome reload &")
 end
 o.remove = function(self, section, value)
 	NXFS.writefile(escconf, "")
@@ -84,8 +85,10 @@ o=s:option(Button,"","")
 o.inputtitle=translate("Reload Config")
 o.write=function()
 	NXFS.remove("/tmp/AdGuardHometmpconfig.yaml")
-	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome","manual"))
 end
 end
 end
+function m.on_commit(map)
+	io.popen("/etc/init.d/AdGuardHome reload &")
+end
 return m