From f7393b8813c4c461b4da08308939beb0cefed515 Mon Sep 17 00:00:00 2001
From: Stan Grishin <stangri@melmac.net>
Date: Thu, 22 Aug 2019 16:34:14 -0700
Subject: [PATCH] simple-adblock: boot-up optimization

Signed-off-by: Stan Grishin <stangri@melmac.net>
---
 net/simple-adblock/Makefile                  |  2 +-
 net/simple-adblock/files/simple-adblock.init | 21 +++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile
index 4e8024230c..b887356bca 100644
--- a/net/simple-adblock/Makefile
+++ b/net/simple-adblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=simple-adblock
 PKG_VERSION:=1.8.0
-PKG_RELEASE:=0
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 PKG_LICENSE:=GPL-3.0-or-later
 
diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init
index 9818bc6614..68ad8f40a9 100644
--- a/net/simple-adblock/files/simple-adblock.init
+++ b/net/simple-adblock/files/simple-adblock.init
@@ -704,7 +704,7 @@ boot() {
 
 start_service() {
 	is_enabled 'on_start' || return 1
-	local ip status error action
+	local ip action status error message stats
 	if create_lock; then
 		procd_open_instance "main"
 		procd_set_param command /bin/true
@@ -734,19 +734,20 @@ start_service() {
 			fi
 		fi
 		procd_close_instance
+
 		status="$(tmpfs get status)"
 		error="$(tmpfs get error)"
+		message="$(tmpfs get message)"
+		stats="$(tmpfs get stats)"
 		action="$(tmpfs get triggers)"
-		tmpfs set triggers
-		tmpfs del status
-		tmpfs del message
-		tmpfs del error
-		tmpfs del stats
 
 		case "$1" in
 			download) action="download";;
 			restart|*)
-				if [ ! -s "$outputFile" ] && ! cacheOps 'test' && ! cacheOps 'testGzip'; then
+				if [ "$1" != "restart" ] && [ -s "$outputFile" ] && [ -n "$status" ]; then
+					status
+					exit 0
+				elif [ ! -s "$outputFile" ] && ! cacheOps 'test' && ! cacheOps 'testGzip'; then
 					action="download"
 				elif cacheOps 'test' || cacheOps 'testGzip'; then
 					action="start"
@@ -758,6 +759,12 @@ start_service() {
 			;;
 		esac
 
+		tmpfs del status
+		tmpfs del error
+		tmpfs del message
+		tmpfs del stats
+		tmpfs set triggers
+
 		case $action in
 			download)
 				if [ -s "$outputFile" ] || cacheOps 'test' || cacheOps 'testGzip'; then
-- 
2.30.2