Compare commits

...

3 Commits

Author SHA1 Message Date
Andrey Petelin
14f704fcb8 fix: use echolog for sing-box start failure 2025-11-26 15:47:12 +05:00
Andrey Petelin
ff43f477e9 chore: restore shutdown_correctly logic 2025-11-26 14:14:27 +05:00
Andrey Petelin
576e58fd17 chore: restore start_main and stop_main; have reload call them instead of full start/stop 2025-11-26 13:56:10 +05:00

View File

@@ -104,7 +104,7 @@ has_outbound_section() {
return $section_exists return $section_exists
} }
start() { start_main() {
log "Starting podkop" log "Starting podkop"
check_requirements check_requirements
@@ -133,23 +133,16 @@ start() {
config_foreach add_cron_job "section" config_foreach add_cron_job "section"
/etc/init.d/sing-box start /etc/init.d/sing-box start
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Failed to start sing-box service" echolog "Failed to start sing-box service"
exit 1 exit 1
fi fi
config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0
if [ "$dont_touch_dhcp" -eq 0 ]; then
dnsmasq_configure
fi
uci_set "podkop" "settings" "shutdown_correctly" 0
uci commit "podkop" && config_load "$PODKOP_CONFIG"
log "Nice" log "Nice"
list_update & list_update &
echo $! > /var/run/podkop_list_update.pid echo $! > /var/run/podkop_list_update.pid
} }
stop() { stop_main() {
log "Stopping the podkop" log "Stopping the podkop"
if [ -f /var/run/podkop_list_update.pid ]; then if [ -f /var/run/podkop_list_update.pid ]; then
@@ -180,14 +173,30 @@ stop() {
ip route flush table podkop ip route flush table podkop
fi fi
log "Stop sing-box"
/etc/init.d/sing-box stop
}
start() {
start_main
config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0
if [ "$dont_touch_dhcp" -eq 0 ]; then
dnsmasq_configure
fi
uci_set "podkop" "settings" "shutdown_correctly" 0
uci commit "podkop" && config_load "$PODKOP_CONFIG"
}
stop() {
local dont_touch_dhcp local dont_touch_dhcp
config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0 config_get_bool dont_touch_dhcp "settings" "dont_touch_dhcp" 0
if [ "$dont_touch_dhcp" -eq 0 ]; then if [ "$dont_touch_dhcp" -eq 0 ]; then
dnsmasq_restore dnsmasq_restore
fi fi
log "Stop sing-box" stop_main
/etc/init.d/sing-box stop
uci_set "podkop" "settings" "shutdown_correctly" 1 uci_set "podkop" "settings" "shutdown_correctly" 1
uci commit "podkop" && config_load "$PODKOP_CONFIG" uci commit "podkop" && config_load "$PODKOP_CONFIG"
@@ -195,8 +204,8 @@ stop() {
reload() { reload() {
log "Podkop reload" log "Podkop reload"
stop stop_main
start start_main
} }
restart() { restart() {