luci-app-mosdns: disable service restarts following rule updates

Signed-off-by: sbwml <admin@cooluc.com>

Author: sbwml

luci-app-mosdns/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-mosdns
-PKG_VERSION:=1.7.0
+PKG_VERSION:=1.7.1
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI Support for mosdns

luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js

@@ -391,10 +391,7 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/cloudflare-cidr.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
-					.then(function (i) {
-						return fs.exec('/etc/init.d/mosdns', ['restart']);
-					});
+				return fs.write('/etc/mosdns/rule/cloudflare-cidr.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
 			});
 		};
 

luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js

@@ -3,12 +3,6 @@
 'require fs';
 'require ui';
 'require view';
-'require rpc';
-
-var callRestart = rpc.declare({
-	object: 'luci.mosdns',
-	method: 'restart'
-});
 
 return view.extend({
 	render: function () {
@@ -274,19 +268,9 @@ return view.extend({
 	},
 
 	handleSaveApply: function (ev) {
-		var m = this.map;
-		onclick = L.bind(this.handleSave, this, m);
-		return callRestart()
-			.then(function (res) {
-				if (res && res.code === 0) {
-					window.location.reload();
-				} else {
-					ui.addNotification(null, E('p', _('Failed to restart mosdns: %s').format(res.output || 'Unknown error')));
-				}
-			})
-			.catch(function (e) {
-				ui.addNotification(null, E('p', _('Failed to restart mosdns: %s').format(e.message)));
-			});
+		return this.handleSave(ev).then(function() {
+			window.location.reload();
+		});
 	},
 	handleReset: null
 });

luci-app-mosdns/root/etc/init.d/mosdns

@@ -822,10 +822,7 @@ start_service() {
 		fi
 	fi
 
-	[ "$update_list" -eq 1 ] && {
-		sleep 3
-		$MOSDNS_SCRIPT update_adlist
-	} &
+	[ "$update_list" -eq 1 ] && $MOSDNS_SCRIPT update_adlist &
 }
 
 stop_service() {

luci-app-mosdns/root/usr/share/mosdns/mosdns.uc

@@ -315,12 +315,10 @@ switch (action) {
 	case "update":
 		update_geodat();
 		update_adlist();
-		exec_sys('/etc/init.d/mosdns restart');
+		v2dat_dump();
 		break;
 	case "update_adlist":
-		if (update_adlist()) {
-			exec_sys('/etc/init.d/mosdns restart');
-		}
+		update_adlist();
 		break;
 	case "v2dat_dump":
 		v2dat_dump();

luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json

@@ -18,8 +18,7 @@
 					"clean_log",
 					"flush_cache",
 					"get_version",
-					"print_log",
-					"restart"
+					"print_log"
 				]
 			},
 			"uci": [ "mosdns" ]

luci-app-mosdns/root/usr/share/rpcd/ucode/luci.mosdns

@@ -34,11 +34,6 @@ function exec_sys(cmd) {
 	return { code: code, stdout: stdout || "" };
 }
 
-function restart_mosdns() {
-	let p = popen('(sleep 1; /etc/init.d/mosdns restart) >/dev/null 2>&1 &', 'r');
-	if (p) p.close();
-}
-
 function get_logfile_path_internal() {
 	let uci_cursor = cursor();
 	uci_cursor.load('mosdns');
@@ -124,13 +119,6 @@ const methods = {
 				return { error: res.stdout };
 			}
 		}
-	},
-
-	restart: {
-		call: function() {
-			restart_mosdns();
-			return { code: 0, output: "mosdns is restarting in background." };
-		}
 	}
 };