resolve conflict

Author: manojown

.gitignore

@@ -9,6 +9,7 @@
 /strain-ui/coverage
 
 .env.pg
+temp
 # production
 /strain-ui/build
 /strain-ui/dist

Dockerfile

@@ -23,5 +23,4 @@ RUN chmod +x ./main
 EXPOSE 3005
 ENV MASTER_IP ""
 ENV TOKEN ""
-ENV PORT ""
-CMD ./main -MASTER_IP $MASTER_IP -TOKEN $TOKEN -PORT $PORT
+CMD ./main -MASTER_IP $MASTER_IP -TOKEN $TOKEN

README.md

@@ -20,6 +20,9 @@ as many server as you can to run test script across all the server at same time.
 
 1. `docker run -it -p 3005:3005 --platform linux/amd64 manojown1/loadtester:latest` (outer port can be change according to the need.)
 
+## Run as workers for distributed testing 
+ `docker run -it -p ANY_AVAILABLE_PORT:3005 -e TOKEN="YOU_CAN_GET_WHILE_CREATE_SERVER" -e MASTER_IP="YOUR_MAIN_SERVER_IP" --platform linux/amd64 manojown1/loadtester:latest`
+
 
 
 ## Download the binary

server/app/controllers/workerMode.go

@@ -2,7 +2,9 @@ package controllers
 
 import (
 	"context"
-	"log"
+
+	log "github.com/sirupsen/logrus"
+
 	"time"
 
 	_ "github.com/cirnum/loadtester/server/app/models"
@@ -19,14 +21,11 @@ import (
 func RunRequest(c *fiber.Ctx) error {
 	ctx := context.Background()
 	request := &models.Request{}
-	log.Println("Run request hit")
 
 	if err := c.BodyParser(request); err != nil {
-		log.Println("Run request Body", err)
-
 		return utils.ResponseError(c, err, constants.InvalidBody, fiber.StatusInternalServerError)
 	}
-	log.Printf("Run request Body %+v \n", request)
+	log.Info("Run request Body %+v \n", request)
 
 	executor := executor.NewExecutor(request.ID, request.ServerId)
 	ctx, cancelCtx := context.WithCancel(ctx)

server/app/utils/requestHelper.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"time"
 
+	log "github.com/sirupsen/logrus"
+
 	helperModels "github.com/cirnum/loadtester/server/app/models"
 	"github.com/cirnum/loadtester/server/db/models"
 
@@ -27,13 +28,14 @@ func RunExecutor(ctx context.Context, request models.Request) error {
 
 	err := utils.RunWorker(request)
 	if err != nil {
-		log.Println("Error while sending request to Worker", err)
+		log.Errorf("Error while sending request to Worker", err.Error())
 		return err
 	}
 
 	go executor.Run(ctx, request)
 	client, err = httpRequest.Initializer(request)
 	if err != nil {
+		log.Error("Error while initiate http client", err.Error())
 		return err
 	}
 
@@ -63,9 +65,12 @@ func TestRequest(request *models.Request) (helperModels.RequestResponse, error)
 	}
 	startTime := time.Now().UnixNano() / int64(time.Millisecond)
 	response, err = utils.Do(method, request.URL, body, headers)
+
+	if err != nil {
+		log.Error("Error while checking service is reachable or not", err.Error())
+	}
 	endTime := time.Now().UnixNano() / int64(time.Millisecond)
 
-	log.Println("Error", err)
 	if err != nil && response == nil {
 		return requestResponse, err
 	}

server/db/providers/sql/provider.go

@@ -1,14 +1,14 @@
 package sql
 
 import (
-	"log"
 	"os"
 	"time"
 
 	"github.com/cirnum/loadtester/server/db/models"
 	"github.com/cirnum/loadtester/server/pkg/constants"
 	"github.com/glebarez/sqlite"
 	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
@@ -52,7 +52,7 @@ func NewProvider() (*provider, error) {
 
 	dbType := os.Getenv(constants.DbType)
 	dbDNS := os.Getenv(constants.DbDns)
-	log.Println("dbDNS:", dbType, dbDNS)
+	log.Infof("dbType: %s, dbDNS: %s \n", dbType, dbDNS)
 	switch dbType {
 	case constants.DbTypeSQL:
 		sqlDB, err = gorm.Open(mysql.Open(dbDNS), ormConfig)

server/main.go

@@ -3,11 +3,12 @@ package main
 import (
 	"embed"
 	"flag"
-	"fmt"
-	"log"
+
 	"os"
 	"time"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/cirnum/loadtester/server/db"
 	"github.com/cirnum/loadtester/server/pkg/configs"
 	"github.com/clerkinc/clerk-sdk-go/clerk"
@@ -77,9 +78,9 @@ func main() {
 }
 
 func isWorkerMode() bool {
-	portPtr := flag.String("PORT", "3005", "Take the dafault port if port is empty (Required)")
+	portPtr := flag.String("PORT", "3005", "Take the dafault port if port is empty")
 	token := flag.String("TOKEN", "", "Please pass the token (Required)")
-	masterIp := flag.String("MASTER_IP", "", "Please pass the master node ip.")
+	masterIp := flag.String("MASTER_IP", "", "Please pass the master node ip. (Required)")
 	flag.Parse()
 
 	localIp := utils.GetPublicIp()
@@ -88,15 +89,17 @@ func isWorkerMode() bool {
 		configs.ConfigProvider.HostIp = localIp
 		configs.ConfigProvider.IsSlave = false
 		configs.ConfigProvider.IP = os.Getenv("SERVER_HOST")
-		fmt.Printf("Master %+v \n", configs.ConfigProvider)
+		log.Info("Master Config: %+v \n", configs.ConfigProvider)
+		log.Info(string("\033[34m"), "Master service initiated.")
 		return false
 	}
-	log.Println("Started node as worker.")
 	configs.ConfigProvider = configs.Initialize(*portPtr, *token, *masterIp)
 	configs.ConfigProvider.IsSlave = true
 	configs.ConfigProvider.IP = "0.0.0.0"
 	configs.ConfigProvider.HostIp = localIp
-	fmt.Printf("Worker %+v \n", configs.ConfigProvider)
+
+	log.Info("Worker Config: %+v \n", configs.ConfigProvider)
+	log.Info(string("\033[34m"), "Worker service initiated.")
 	return true
 }
 

server/pkg/clients/http.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"io"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"reflect"
 	"strings"
@@ -16,6 +15,7 @@ import (
 	"github.com/cirnum/loadtester/server/pkg/executor"
 	metrics "github.com/cirnum/loadtester/server/pkg/executor/metrics"
 	"github.com/cirnum/loadtester/server/pkg/utils"
+	log "github.com/sirupsen/logrus"
 )
 
 type RequestSend struct {
@@ -130,12 +130,12 @@ func (h *HttpClient) RunScen(ctx context.Context, conf models.Request) {
 		case err = <-finished:
 			ctx.Done()
 		case <-ctx.Done():
-			log.Println("Job Completed")
+			log.Info("Job Completed")
 			return
 		}
 	}()
 	h.Manager(ctx, conf, finished)
-	log.Println("Error", err)
+	log.Error("Error", err)
 }
 
 func (h *HttpClient) Manager(ctx context.Context, conf models.Request, done chan<- error) {

server/pkg/executor/worker.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log"
+	"net/http"
 	"os"
 	"sync"
 	"time"
@@ -16,6 +16,7 @@ import (
 	metrics "github.com/cirnum/loadtester/server/pkg/executor/metrics"
 	"github.com/cirnum/loadtester/server/pkg/utils"
 	gometrics "github.com/rcrowley/go-metrics"
+	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -238,7 +239,13 @@ func (e *Executor) logScaledOnCue(ctx context.Context, ch chan interface{}) erro
 						headers := map[string]string{
 							"Content-Type": "application/json",
 						}
-						utils.Do("POST", url, body, headers)
+						res, err := utils.Do(http.MethodPost, url, body, headers)
+						if err != nil {
+							log.Error("Failed to connect to master host", err.Error())
+						}
+						if res != nil {
+							log.Warnf("For url: %s, statusCode: %s", url, res.StatusCode)
+						}
 					} else {
 						db.Provider.AddLoadByRequestId(ctx, value)
 					}

server/pkg/utils/server.go

@@ -1,13 +1,13 @@
 package utils
 
 import (
-	"log"
 	"os"
 	"os/signal"
 	"time"
 
 	"github.com/cirnum/loadtester/server/db/models"
 	"github.com/gofiber/fiber/v2"
+	log "github.com/sirupsen/logrus"
 )
 
 // Check server Status
@@ -43,7 +43,7 @@ func StartServerWithGracefulShutdown(a *fiber.App) {
 		// Received an interrupt signal, shutdown.
 		if err := a.Shutdown(); err != nil {
 			// Error from closing listeners, or context timeout:
-			log.Printf("Oops... Server is not shutting down! Reason: %v", err)
+			log.Errorf("Oops... Server is not shutting down! Reason: %v", err)
 		}
 
 		close(idleConnsClosed)
@@ -54,7 +54,7 @@ func StartServerWithGracefulShutdown(a *fiber.App) {
 
 	// Run server.
 	if err := a.Listen(fiberConnURL); err != nil {
-		log.Printf("Oops... Server is not running! Reason: %v", err)
+		log.Errorf("Oops... Server is not running! Reason: %v", err)
 	}
 
 	<-idleConnsClosed
@@ -66,6 +66,6 @@ func StartServer(a *fiber.App) {
 	fiberConnURL, _ := ConnectionURLBuilder("fiber")
 	// Run server.
 	if err := a.Listen(fiberConnURL); err != nil {
-		log.Printf("Oops... Server is not running! Reason: %v", err)
+		log.Errorf("Oops... Server is not running! Reason: %v", err)
 	}
 }