CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-08-10 13:20:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

internal/router: only do cleanup in cd mode on freebsd

Browse Source
This commit is contained in:
Cuong Manh Le
2023-08-09 23:56:07 +07:00
committed by Cuong Manh Le
parent c271896551
commit 774f07dd7f
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/ctrld/cli.go
+2 -2
View File
@@ -283,13 +283,13 @@ func initCLI() {
rootCertPool = cp rootCertPool = cp
} }
p.onStarted = append(p.onStarted, func() { p.onStarted = append(p.onStarted, func() {
mainLog.Load().Debug().Msg("router setup") mainLog.Load().Debug().Msg("router setup on start")
if err := p.router.Setup(); err != nil { if err := p.router.Setup(); err != nil {
mainLog.Load().Error().Err(err).Msg("could not configure router") mainLog.Load().Error().Err(err).Msg("could not configure router")
} }
}) })
p.onStopped = append(p.onStopped, func() { p.onStopped = append(p.onStopped, func() {
mainLog.Load().Debug().Msg("router cleanup") mainLog.Load().Debug().Msg("router cleanup on stop")
if err := p.router.Cleanup(); err != nil { if err := p.router.Cleanup(); err != nil {
mainLog.Load().Error().Err(err).Msg("could not cleanup router") mainLog.Load().Error().Err(err).Msg("could not cleanup router")
} }
internal/router/os_freebsd.go
+14 -2
View File
@@ -109,7 +109,7 @@ func (or *osRouter) Setup() error {
} }
func (or *osRouter) Cleanup() error { func (or *osRouter) Cleanup() error {
if or.cfg.FirstListener().IsDirectDnsListener() { if or.cdMode {
_ = exec.Command(unboundRcPath, "onerestart").Run() _ = exec.Command(unboundRcPath, "onerestart").Run()
_ = exec.Command(dnsmasqRcPath, "onerestart").Run() _ = exec.Command(dnsmasqRcPath, "onerestart").Run()
} }
@@ -129,10 +129,22 @@ name="{{.Name}}"
rcvar="${name}_enable" rcvar="${name}_enable"
{{.Name}}_env="IS_DAEMON=1" {{.Name}}_env="IS_DAEMON=1"
pidfile="/var/run/${name}.pid" pidfile="/var/run/${name}.pid"
child_pidfile="/var/run/${name}_child.pid"
command="/usr/sbin/daemon" command="/usr/sbin/daemon"
daemon_args="-P ${pidfile} -r -t \"${name}: daemon\"{{if .WorkingDirectory}} -c {{.WorkingDirectory}}{{end}}" daemon_args="-P ${pidfile} -p ${child_pidfile} -t \"${name}: daemon\"{{if .WorkingDirectory}} -c {{.WorkingDirectory}}{{end}}"
command_args="${daemon_args} {{.Path}}{{range .Arguments}} {{.}}{{end}}" command_args="${daemon_args} {{.Path}}{{range .Arguments}} {{.}}{{end}}"
stop_cmd="ctrld_stop"
ctrld_stop() {
pid=$(cat ${pidfile})
child_pid=$(cat ${child_pidfile})
if [ -e "${child_pidfile}" ]; then
kill -s TERM "${child_pid}"
wait_for_pids "${child_pid}" "${pidfile}"
fi
}
load_rc_config "${name}" load_rc_config "${name}"
run_rc_command "$1" run_rc_command "$1"
` `