From b813f2180ed8bf7feaa2010f7aa97a2d50f9ccaf Mon Sep 17 00:00:00 2001 From: Puqns67 Date: Sun, 16 Jun 2024 01:15:02 +0800 Subject: [PATCH 2/3] build: remove service management support for this build --- main.go | 224 -------------------------------------------------------- 1 file changed, 224 deletions(-) diff --git a/main.go b/main.go index aa71180..f74e29c 100644 --- a/main.go +++ b/main.go @@ -9,7 +9,6 @@ import ( "net" "net/http" "os" - "os/exec" "path/filepath" "runtime" "strconv" @@ -19,7 +18,6 @@ import ( "github.com/jeessy2/ddns-go/v6/dns" "github.com/jeessy2/ddns-go/v6/util" "github.com/jeessy2/ddns-go/v6/web" - "github.com/kardianos/service" ) // ddns-go 版本 @@ -35,9 +33,6 @@ var every = flag.Int("f", 300, "Update frequency(seconds)") // 缓存次数 var ipCacheTimes = flag.Int("cacheTimes", 5, "Cache times") -// 服务管理 -var serviceType = flag.String("s", "", "Service management (install|uninstall|restart)") - // 配置文件路径 var configFilePath = flag.String("c", util.GetConfigFilePathDefault(), "Custom configuration file path") @@ -102,37 +97,6 @@ func main() { util.SetDNS(*customDNS) } os.Setenv(util.IPCacheTimesENV, strconv.Itoa(*ipCacheTimes)) - switch *serviceType { - case "install": - installService() - case "uninstall": - uninstallService() - case "restart": - restartService() - default: - if util.IsRunInDocker() { - run() - } else { - s := getService() - status, _ := s.Status() - if status != service.StatusUnknown { - // 以服务方式运行 - s.Run() - } else { - // 非服务方式运行 - switch s.Platform() { - case "windows-service": - util.Log("可使用 .\\ddns-go.exe -s install 安装服务运行") - default: - util.Log("可使用 sudo ./ddns-go -s install 安装服务运行") - } - run() - } - } - } -} - -func run() { // 兼容之前的配置文件 conf, _ := config.GetConfigCached() conf.CompatibleConfig() @@ -192,191 +156,3 @@ func runWebServer() error { return http.Serve(l, nil) } - -type program struct{} - -func (p *program) Start(s service.Service) error { - // Start should not block. Do the actual work async. - go p.run() - return nil -} -func (p *program) run() { - run() -} -func (p *program) Stop(s service.Service) error { - // Stop should not block. Return with a few seconds. - return nil -} - -func getService() service.Service { - options := make(service.KeyValue) - var depends []string - - // 确保服务等待网络就绪后再启动 - switch service.ChosenSystem().String() { - case "unix-systemv": - options["SysvScript"] = sysvScript - case "windows-service": - // 将 Windows 服务的启动类型设为自动(延迟启动) - options["DelayedAutoStart"] = true - default: - // 向 Systemd 添加网络依赖 - depends = append(depends, "Requires=network.target", - "After=network-online.target") - } - - svcConfig := &service.Config{ - Name: "ddns-go", - DisplayName: "ddns-go", - Description: "Simple and easy to use DDNS. Automatically update domain name resolution to public IP (Support Aliyun, Tencent Cloud, Dnspod, Cloudflare, Callback, Huawei Cloud, Baidu Cloud, Porkbun, GoDaddy...)", - Arguments: []string{"-l", *listen, "-f", strconv.Itoa(*every), "-cacheTimes", strconv.Itoa(*ipCacheTimes), "-c", *configFilePath}, - Dependencies: depends, - Option: options, - } - - if *noWebService { - svcConfig.Arguments = append(svcConfig.Arguments, "-noweb") - } - - if *skipVerify { - svcConfig.Arguments = append(svcConfig.Arguments, "-skipVerify") - } - - if *customDNS != "" { - svcConfig.Arguments = append(svcConfig.Arguments, "-dns", *customDNS) - } - - prg := &program{} - s, err := service.New(prg, svcConfig) - if err != nil { - log.Fatalln(err) - } - return s -} - -// 卸载服务 -func uninstallService() { - s := getService() - s.Stop() - if service.ChosenSystem().String() == "unix-systemv" { - if _, err := exec.Command("/etc/init.d/ddns-go", "stop").Output(); err != nil { - log.Println(err) - } - } - if err := s.Uninstall(); err == nil { - util.Log("ddns-go 服务卸载成功") - } else { - util.Log("ddns-go 服务卸载失败, 异常信息: %s", err) - } -} - -// 安装服务 -func installService() { - s := getService() - - status, err := s.Status() - if err != nil && status == service.StatusUnknown { - // 服务未知，创建服务 - if err = s.Install(); err == nil { - s.Start() - util.Log("安装 ddns-go 服务成功! 请打开浏览器并进行配置") - if service.ChosenSystem().String() == "unix-systemv" { - if _, err := exec.Command("/etc/init.d/ddns-go", "enable").Output(); err != nil { - log.Println(err) - } - if _, err := exec.Command("/etc/init.d/ddns-go", "start").Output(); err != nil { - log.Println(err) - } - } - return - } - util.Log("安装 ddns-go 服务失败, 异常信息: %s", err) - } - - if status != service.StatusUnknown { - util.Log("ddns-go 服务已安装, 无需再次安装") - } -} - -// 重启服务 -func restartService() { - s := getService() - status, err := s.Status() - if err == nil { - if status == service.StatusRunning { - if err = s.Restart(); err == nil { - util.Log("重启 ddns-go 服务成功") - } - } else if status == service.StatusStopped { - if err = s.Start(); err == nil { - util.Log("启动 ddns-go 服务成功") - } - } - } else { - util.Log("ddns-go 服务未安装, 请先安装服务") - } -} - -const sysvScript = `#!/bin/sh /etc/rc.common -DESCRIPTION="{{.Description}}" -cmd="{{.Path}}{{range .Arguments}} {{.|cmd}}{{end}}" -name="ddns-go" -pid_file="/var/run/$name.pid" -stdout_log="/var/log/$name.log" -stderr_log="/var/log/$name.err" -START=99 -get_pid() { - cat "$pid_file" -} -is_running() { - [ -f "$pid_file" ] && cat /proc/$(get_pid)/stat > /dev/null 2>&1 -} -start() { - if is_running; then - echo "Already started" - else - echo "Starting $name" - {{if .WorkingDirectory}}cd '{{.WorkingDirectory}}'{{end}} - $cmd >> "$stdout_log" 2>> "$stderr_log" & - echo $! > "$pid_file" - if ! is_running; then - echo "Unable to start, see $stdout_log and $stderr_log" - exit 1 - fi - fi -} -stop() { - if is_running; then - echo -n "Stopping $name.." - kill $(get_pid) - for i in $(seq 1 10) - do - if ! is_running; then - break - fi - echo -n "." - sleep 1 - done - echo - if is_running; then - echo "Not stopped; may still be shutting down or shutdown may have failed" - exit 1 - else - echo "Stopped" - if [ -f "$pid_file" ]; then - rm "$pid_file" - fi - fi - else - echo "Not running" - fi -} -restart() { - stop - if is_running; then - echo "Unable to stop, will not attempt to start" - exit 1 - fi - start -} -` -- 2.49.0