From 3b4a55f18ed27b83f2defe40a5cf36abd7d69094 Mon Sep 17 00:00:00 2001 From: Philipp Mieden Date: Fri, 24 May 2019 17:40:26 +0200 Subject: [PATCH] added flags to testclient, added optional getrepo call --- repo/repo.go | 2 +- testing/client/client.go | 54 ++++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/repo/repo.go b/repo/repo.go index df9720e..152c94e 100644 --- a/repo/repo.go +++ b/repo/repo.go @@ -100,7 +100,7 @@ func (repo *Repo) getNodes(nodeRequests map[string]*requests.Node, env *requests for nodeName, nodeRequest := range nodeRequests { if nodeName == "" || nodeRequest.ID == "" { - Log.Error("invalid node request", zap.Error(errors.New("nodeName or nodeRequest.ID empty"))) + Log.Info("invalid node request", zap.Error(errors.New("nodeName or nodeRequest.ID empty"))) continue } Log.Debug("adding node", zap.String("name", nodeName), zap.String("requestID", nodeRequest.ID)) diff --git a/testing/client/client.go b/testing/client/client.go index 4e8b830..3641a66 100644 --- a/testing/client/client.go +++ b/testing/client/client.go @@ -1,6 +1,7 @@ package main import ( + "flag" "log" "time" @@ -8,24 +9,51 @@ import ( "github.com/foomo/contentserver/client" ) +// ***REMOVED*** +var ( + flagAddr = flag.String("addr", "http://127.0.0.1:9191/contentserver", "set addr") + flagGetRepo = flag.Bool("getRepo", false, "get repo") + flagUpdate = flag.Bool("update", true, "trigger content update") + flagNum = flag.Int("num", 100, "num repititions") + flagDelay = flag.Int("delay", 2, "delay in seconds") +) + func main() { - serverAdr := "http://127.0.0.1:9191/contentserver" - c, errClient := client.NewHTTPClient(serverAdr) + + flag.Parse() + + c, errClient := client.NewHTTPClient(*flagAddr) if errClient != nil { log.Fatal(errClient) } - for i := 1; i <= 150; i++ { - go func(num int) { - log.Println("start update") - resp, errUpdate := c.Update() - if errUpdate != nil { - spew.Dump(resp) - log.Fatal(errUpdate) - } - log.Println(num, "update done", resp) - }(i) - time.Sleep(2 * time.Second) + for i := 1; i <= *flagNum; i++ { + + if *flagUpdate { + go func(num int) { + log.Println("start update") + resp, errUpdate := c.Update() + if errUpdate != nil { + spew.Dump(resp) + log.Fatal(errUpdate) + } + log.Println(num, "update done", resp) + }(i) + } + + if *flagGetRepo { + go func(num int) { + log.Println("get repo", num) + _, err := c.GetRepo() + if err != nil { + // spew.Dump(resp) + log.Fatal("failed to get repo") + } + log.Println(num, "get repo done") + }(i) + } + + time.Sleep(time.Duration(*flagDelay) * time.Second) } log.Println("done")