From f989590d14c303e5395fc7887e440d886fd56b14 Mon Sep 17 00:00:00 2001 From: dengsgo Date: Tue, 3 Mar 2020 11:12:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fileboy.go | 20 ++++++++++---------- taskman.go | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fileboy.go b/fileboy.go index 6ec4217..b74ea5c 100644 --- a/fileboy.go +++ b/fileboy.go @@ -57,16 +57,16 @@ func parseConfig() { cfg = new(FileGirl) fc, err := ioutil.ReadFile(getFileGirlPath()) if err != nil { - logError("The filegirl.yaml file in", projectFolder, "is not exist! ", err) + logError("the filegirl.yaml file in", projectFolder, "is not exist! ", err) fmt.Print(firstRunHelp) - logAndExit("Fileboy unable to run.") + logAndExit("fileboy unable to run.") } err = yaml.Unmarshal(fc, cfg) if err != nil { - logAndExit("Parsed filegirl.yaml failed: ", err) + logAndExit("parsed filegirl.yaml failed: ", err) } if cfg.Core.Version > Version { - logAndExit("Current fileboy support max version : ", Version) + logAndExit("current fileboy support max version : ", Version) } // init map cfg.Monitor.TypesMap = map[string]bool{} @@ -283,15 +283,15 @@ func parseArgs() { case "init": _, err := ioutil.ReadFile(getFileGirlPath()) if err == nil { - logError("Profile filegirl.yaml already exists.") - logAndExit("If you want to regenerate filegirl.yaml, delete it first") + logError("profile filegirl.yaml already exists.") + logAndExit("delete it first when you want to regenerate filegirl.yaml") } err = ioutil.WriteFile(getFileGirlPath(), []byte(exampleFileGirl), 0644) if err != nil { - logError("Profile filegirl.yaml create failed! ", err) + logError("profile filegirl.yaml create failed! ", err) return } - logUInfo("Profile filegirl.yaml created ok") + logUInfo("profile filegirl.yaml created ok") return case "exec": parseConfig() @@ -302,11 +302,11 @@ func parseArgs() { case "help", "--help", "--h", "-h": fmt.Print(helpStr) default: - logAndExit("Unknown parameter, use 'fileboy help' to view available commands") + logAndExit("unknown parameter, use 'fileboy help' to view available commands") } return default: - logAndExit("Unknown parameters, use `fileboy help` show help info.") + logAndExit("unknown parameters, use `fileboy help` show help info.") } } diff --git a/taskman.go b/taskman.go index a98508c..3729f7b 100644 --- a/taskman.go +++ b/taskman.go @@ -33,7 +33,7 @@ func newTaskMan(delay int, callUrl string) *TaskMan { if len(t.waitQueue) > 0 { cf := t.waitQueue[len(t.waitQueue)-1] if len(t.waitQueue) > 1 { - logInfo("Number of redundant tasks dropped:", len(t.waitQueue)-1) + logInfo("redundant tasks dropped:", len(t.waitQueue)-1) } t.waitQueue = []*changedFile{} go t.preRun(cf) @@ -69,8 +69,8 @@ func (t *TaskMan) dispatcher(cf *changedFile) { t.waitChan <- true return } - logInfo("Waitting for the last task to finish") - logInfo("Number of waiting tasks:", len(t.waitQueue)) + logInfo("waitting for the last task to finish") + logInfo("waiting tasks:", len(t.waitQueue)) } else { t.preRun(cf) }