From 4f81692954ec3c41d64ce237b20ab8f5234e9676 Mon Sep 17 00:00:00 2001 From: dengsgo Date: Mon, 16 Mar 2020 11:16:14 +0800 Subject: [PATCH] typo deamon->daemon --- .github/workflows/go.yml | 2 +- .travis.yml | 2 +- CHANGELOG.md | 4 ++++ deamon.go | 18 +++++++++--------- fileboy.go | 6 +++--- raw.go | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 28f0577..8df59e1 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -39,7 +39,7 @@ jobs: fileboy init cat filegirl.yaml fileboy exec - fileboy deamon + fileboy daemon ls -al .fileboy.pid ps aux | grep fileboy fileboy stop diff --git a/.travis.yml b/.travis.yml index 98a14d9..ec7946f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ script: - fileboy init - cat filegirl.yaml - fileboy exec - - fileboy deamon + - fileboy daemon - ls -al .fileboy.pid - ps aux | grep fileboy - fileboy stop diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f9d6c5..5b514be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### Release v1.15 +2020.03.16 + +- typo deamon->daemon + 2020.03.08 - 优化 指令模式 diff --git a/deamon.go b/deamon.go index 4afd284..4de9932 100644 --- a/deamon.go +++ b/deamon.go @@ -12,11 +12,11 @@ func getPidFile() string { return projectFolder + "/.fileboy.pid" } -func runAsDeamon() (int, error) { +func runAsDaemon() (int, error) { if runtime.GOOS == "windows" { logAndExit("daemons mode cannot run on windows.") } - err := stopDeamon() + err := stopDaemon() if err != nil { logAndExit(err) } @@ -24,22 +24,22 @@ func runAsDeamon() (int, error) { if err != nil { logAndExit("cannot found `fileboy` command in the PATH") } - deamon := exec.Command("fileboy") - deamon.Dir = projectFolder - deamon.Env = os.Environ() - deamon.Stdout = os.Stdout - err = deamon.Start() + daemon := exec.Command("fileboy") + daemon.Dir = projectFolder + daemon.Env = os.Environ() + daemon.Stdout = os.Stdout + err = daemon.Start() if err != nil { logAndExit(err) } - pid := deamon.Process.Pid + pid := daemon.Process.Pid if pid != 0 { ioutil.WriteFile(getPidFile(), []byte(strconv.Itoa(pid)), 0644) } return pid, nil } -func stopDeamon() error { +func stopDaemon() error { bs, err := ioutil.ReadFile(getPidFile()) if err != nil { return nil diff --git a/fileboy.go b/fileboy.go index e7951e6..c837d28 100644 --- a/fileboy.go +++ b/fileboy.go @@ -265,8 +265,8 @@ func parseArgs() { case len(os.Args) > 1: c := os.Args[1] switch c { - case "deamon": - pid, err := runAsDeamon() + case "deamon", "daemon": + pid, err := runAsDaemon() if err != nil { logAndExit(err) } @@ -274,7 +274,7 @@ func parseArgs() { logUInfo("fileboy is ready. the main process will run as a daemons") return case "stop": - err := stopDeamon() + err := stopDaemon() if err != nil { logAndExit(err) } diff --git a/raw.go b/raw.go index 44d7f5d..e7315be 100644 --- a/raw.go +++ b/raw.go @@ -112,7 +112,7 @@ Usage of fileboy: 初始化 fileboy, 在当前目录生成 filegirl.yaml 配置文件 exec 尝试运行定义的 command 命令 - deamon + daemon 读取当前目录下的 filegirl.yaml 配置,以守护进程的方式运行在后台 stop 停止守护进程