From 767a4d54da5ea2b16b84df7d8f49c61f6ccb5753 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Sun, 21 Aug 2022 15:31:35 +0700 Subject: all: remove trailing new line on each mlog format The mlog functions automatically add new line to each format, so we did not need to add it manually. --- attack_result.go | 4 ++-- example/example.go | 2 +- http_target.go | 2 +- internal/cmd/trunks/main.go | 36 ++++++++++++++++++------------------ trunks.go | 38 ++++++++++++++++++++------------------ 5 files changed, 42 insertions(+), 40 deletions(-) diff --git a/attack_result.go b/attack_result.go index 856051b..26f1a9d 100644 --- a/attack_result.go +++ b/attack_result.go @@ -99,14 +99,14 @@ func (ar *AttackResult) cancel() { if ar.fout != nil { err := ar.fout.Close() if err != nil { - mlog.Errf("AttackResult.cancel %s: %s\n", ar.HttpTargetID, err) + mlog.Errf(`AttackResult.cancel %s: %s`, ar.HttpTargetID, err) } ar.fout = nil if len(ar.fullpath) > 0 { err = os.Remove(ar.fullpath) if err != nil { - mlog.Errf("AttackResult.cancel %s: %s\n", ar.HttpTargetID, err) + mlog.Errf(`AttackResult.cancel %s: %s`, ar.HttpTargetID, err) } } } diff --git a/example/example.go b/example/example.go index 04c94fa..0ec2bb8 100644 --- a/example/example.go +++ b/example/example.go @@ -106,7 +106,7 @@ func (ex *Example) Start() (err error) { go func() { err = ex.wsServer.Start() if err != nil { - mlog.Errf("example.Start: %s\n", err) + mlog.Errf(`example.Start: %s`, err) } }() diff --git a/http_target.go b/http_target.go index 94a5609..154d839 100644 --- a/http_target.go +++ b/http_target.go @@ -125,7 +125,7 @@ func (ht *HttpTarget) deleteResult(result *AttackResult) { err := os.Remove(result.fullpath) if err != nil { - mlog.Errf("deleteResult: %q: %s\n", result.fullpath, err) + mlog.Errf(`deleteResult: %q: %s`, result.fullpath, err) } } diff --git a/internal/cmd/trunks/main.go b/internal/cmd/trunks/main.go index f3e0f94..1367214 100644 --- a/internal/cmd/trunks/main.go +++ b/internal/cmd/trunks/main.go @@ -37,12 +37,12 @@ func main() { err := os.Setenv(trunks.EnvDevelopment, "1") if err != nil { - mlog.Fatalf("%s\n", err) + mlog.Fatalf(`%s`, err) } ex, err := example.New() if err != nil { - mlog.Fatalf("%s\n", err) + mlog.Fatalf(`%s`, err) } go workerBuild(false) @@ -57,7 +57,7 @@ func main() { err = ex.Start() if err != nil { - mlog.Fatalf("%s\n", err) + mlog.Fatalf(`%s`, err) } } @@ -104,7 +104,7 @@ func workerBuild(oneTime bool) { mfsWww, err := memfs.New(mfsOpts) if err != nil { - mlog.Fatalf("%s: %s", logp, err) + mlog.Fatalf(`%s: %s`, logp, err) } if oneTime { @@ -142,38 +142,38 @@ func workerBuild(oneTime bool) { err = dirWatchWww.Start() if err != nil { - mlog.Fatalf("%s: %s", logp, err) + mlog.Fatalf(`%s: %s`, logp, err) } - mlog.Outf("%s: started ...\n", logp) + mlog.Outf(`%s: started ...`, logp) ticker := time.NewTicker(5 * time.Second) for { select { case ns := <-dirWatchWww.C: if strings.HasSuffix(ns.Node.SysPath, ".ts") { - mlog.Outf("%s: update %s\n", logp, ns.Node.SysPath) + mlog.Outf(`%s: update %s`, logp, ns.Node.SysPath) tsCount++ } else if strings.HasSuffix(ns.Node.SysPath, ".json") { - mlog.Outf("%s: update %s\n", logp, ns.Node.SysPath) + mlog.Outf(`%s: update %s`, logp, ns.Node.SysPath) tsCount++ } else if strings.HasSuffix(ns.Node.SysPath, ".js") || strings.HasSuffix(ns.Node.SysPath, ".html") { embedCount++ - mlog.Outf("%s: update %s\n", logp, ns.Node.Path) + mlog.Outf(`%s: update %s`, logp, ns.Node.Path) node, err := mfsWww.Get(ns.Node.Path) if err != nil { - mlog.Errf("%s: %q: %s", logp, ns.Node.Path, err) + mlog.Errf(`%s: %q: %s`, logp, ns.Node.Path, err) continue } if node != nil { err = node.Update(nil, 0) if err != nil { - mlog.Errf("%s: %q: %s", logp, node.Path, err) + mlog.Errf(`%s: %q: %s`, logp, node.Path, err) } } } else { - mlog.Outf("%s: unknown file updated %s\n", logp, ns.Node.SysPath) + mlog.Outf(`%s: unknown file updated %s`, logp, ns.Node.SysPath) } case <-ticker.C: @@ -194,32 +194,32 @@ func workerBuild(oneTime bool) { func workerDocs() { logp := "workerDocs" - mlog.Outf("%s: started ...\n", logp) + mlog.Outf(`%s: started ...`, logp) opts := &ciigo.ConvertOptions{ Root: "_www/docs", } err := ciigo.Watch(opts) if err != nil { - mlog.Errf("%s: %s", logp, err) + mlog.Errf(`%s: %s`, logp, err) } } func doRunTsc(logp string) (err error) { - mlog.Outf("%s: execute %s\n", logp, cmdTsc) + mlog.Outf(`%s: execute %s`, logp, cmdTsc) err = exec.Run(cmdTsc, nil, nil) if err != nil { - mlog.Errf("%s: %s", logp, err) + mlog.Errf(`%s: %s`, logp, err) return err } return nil } func doGoEmbed(logp string, mfs *memfs.MemFS) (err error) { - mlog.Outf("%s: generate memfs_www_embed.go\n", logp) + mlog.Outf(`%s: generate memfs_www_embed.go`, logp) err = mfs.GoEmbed() if err != nil { - mlog.Errf("%s: %s", logp, err) + mlog.Errf(`%s: %s`, logp, err) return err } return nil diff --git a/trunks.go b/trunks.go index 1e9bd44..d6e5602 100644 --- a/trunks.go +++ b/trunks.go @@ -122,7 +122,7 @@ func (trunks *Trunks) AttackHttp(req *RunRequest) (err error) { req.Target.BaseUrl, req.HttpTarget.Path, req.Target.Opts.RatePerSecond, req.Target.Opts.Duration) - mlog.Outf("%s: %s\n", logp, msg) + mlog.Outf(`%s: %s`, logp, msg) return nil } @@ -206,21 +206,23 @@ func (trunks *Trunks) RunHttp(req *RunRequest) (res *RunResponse, err error) { // Start the Trunks HTTP server that provide user interface for running and // load testing registered Targets. func (trunks *Trunks) Start() (err error) { - mlog.Outf("trunks: scanning previous attack results...\n") + mlog.Outf(`trunks: scanning previous attack results...`) + trunks.scanResultsDir() - mlog.Outf("trunks: starting attack worker...\n") + mlog.Outf(`trunks: starting attack worker...`) go trunks.workerAttackQueue() - mlog.Outf("trunks: starting HTTP server at http://%s\n", trunks.Env.ListenAddress) + mlog.Outf(`trunks: starting HTTP server at http://%s`, trunks.Env.ListenAddress) go func() { err := trunks.Httpd.Start() if err != nil { trunks.errq <- err } }() + go func() { - mlog.Outf("trunks: starting WebSocket server at ws://%s\n", trunks.Env.websocketListenAddress) + mlog.Outf(`trunks: starting WebSocket server at ws://%s`, trunks.Env.websocketListenAddress) err := trunks.Wsd.Start() if err != nil { trunks.errq <- err @@ -235,11 +237,11 @@ func (trunks *Trunks) Start() (err error) { // Stop the Trunks HTTP server. func (trunks *Trunks) Stop() { logp := "trunks.Stop" - mlog.Outf("=== Stopping the Trunks service ...\n") + mlog.Outf(`=== Stopping the Trunks service ...`) err := trunks.Httpd.Stop(0) if err != nil { - mlog.Errf("!!! %s: %s", logp, err) + mlog.Errf(`!!! %s: %s`, logp, err) } trunks.Wsd.Stop() @@ -394,17 +396,17 @@ func (trunks *Trunks) scanResultsDir() { dir, err := os.Open(trunks.Env.ResultsDir) if err != nil { - mlog.Errf("%s: %s\n", logp, err) + mlog.Errf(`%s: %s`, logp, err) return } fis, err := dir.Readdir(0) if err != nil { - mlog.Errf("%s: %s\n", logp, err) + mlog.Errf(`%s: %s`, logp, err) return } - mlog.Outf("--- %s: loading %d files from past results ...\n", logp, len(fis)) + mlog.Outf(`--- %s: loading %d files from past results ...`, logp, len(fis)) for x, fi := range fis { name := fi.Name() @@ -417,20 +419,20 @@ func (trunks *Trunks) scanResultsDir() { t, ht := trunks.getTargetByResultFilename(name) if t == nil { - mlog.Outf("--- %s %d/%d: Target ID not found for %q\n", logp, x+1, len(fis), name) + mlog.Outf(`--- %s %d/%d: Target ID not found for %q`, logp, x+1, len(fis), name) continue } if ht == nil { - mlog.Outf("--- %s %d/%d: HttpTarget ID not found for %q\n", logp, x+1, len(fis), name) + mlog.Outf(`--- %s %d/%d: HttpTarget ID not found for %q`, logp, x+1, len(fis), name) continue } - mlog.Outf("--- %s %d/%d: loading %q with size %d Kb\n", logp, x+1, len(fis), name, fi.Size()/1024) + mlog.Outf(`--- %s %d/%d: loading %q with size %d Kb`, logp, x+1, len(fis), name, fi.Size()/1024) ht.addResult(trunks.Env.ResultsDir, name) } - mlog.Outf("--- %s: all pass results has been loaded ...\n", logp) + mlog.Outf(`--- %s: all pass results has been loaded ...`, logp) for _, target := range trunks.targets { for _, httpTarget := range target.HttpTargets { @@ -481,22 +483,22 @@ func (trunks *Trunks) workerAttackQueue() { rr.result.cancel() if err != nil { - mlog.Errf("%s: %s fail: %s.\n", logp, rr.result.Name, err) + mlog.Errf(`%s: %s fail: %s.`, logp, rr.result.Name, err) } else { - mlog.Outf("%s: %s canceled.\n", logp, rr.result.Name) + mlog.Outf(`%s: %s canceled.`, logp, rr.result.Name) // Inform the caller that the attack has been canceled. trunks.cancelq <- true } } else { err = rr.result.finish() if err != nil { - mlog.Errf("%s %s: %s\n", logp, rr.result.Name, err) + mlog.Errf(`%s %s: %s`, logp, rr.result.Name, err) } trunks.addHttpAttackResult(rr) trunks.wsBroadcastAttackFinish(rr.result) - mlog.Outf("%s: %s finished.\n", logp, rr.result.Name) + mlog.Outf(`%s: %s finished.`, logp, rr.result.Name) } rr.result = nil -- cgit v1.3