Merge pull request #14 from galbarnahum/dev

improved h2load flood and benign client

Author: galbarnahum

tools/evaluate.go

@@ -81,6 +81,7 @@ func EvaluateMadeYouReset(config *ToolConfig) error {
 	configForFloodAttacker.OutputFilename = "h2load.log"
 	configForFloodAttacker.Verbose = true
 	configForFloodAttacker.RequestsPerClient = 0
+	configForFloodAttacker.ShowProgressbar = true
 	FloodAttackStats, err := RunH2load(&configForFloodAttacker, nil)
 	if err != nil {
 		return fmt.Errorf("failed to run h2load: %v", err)

tools/h2load.go

@@ -151,6 +151,9 @@ func h2loadRequestStatsToRunnerResult(stats *h2load.RequestStats, clientsNum int
 }
 
 func RunH2load(toolConfig *ToolConfig, h2loadConf *h2load.H2loadConf) (*RunnerResult, error) {
+	if toolConfig.OutputFilename == "" {
+		toolConfig.OutputFilename = "h2load.log"
+	}
 	logger, err := getLogger(toolConfig, toolConfig.OutputFilename)
 	if err != nil {
 		return nil, err
@@ -186,7 +189,7 @@ func RunH2load(toolConfig *ToolConfig, h2loadConf *h2load.H2loadConf) (*RunnerRe
 	h2loadConf.URL = h2loadURL
 	h2loadConf.ServerAddress = serverConf.ServerAddress
 	h2loadConf.Protocol = serverConf.Protocol
-	return runH2load(h2loadConf, toolConfig.TestDuration, logger, toolConfig.Verbose)
+	return runH2load(h2loadConf, toolConfig.TestDuration, logger, toolConfig.ShowProgressbar)
 }
 
 /*

tools/tools.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/galbarnahum/h2loadGo/h2load"
 	"github.com/galbarnahum/remoteSystemStatsMonitor/stats"
 )
 
@@ -154,10 +155,15 @@ func RunTool(config *ToolConfig) error {
 		// Start h2load in background
 		h2loadBgCh = make(chan *RunnerResult)
 		go func() {
-			waitForAttackTime := time.Second * 3
+			waitForAttackTime := time.Second * 7
 			time.Sleep(waitForAttackTime)
 			configForH2load.TestDuration = config.TestDuration - waitForAttackTime
-			h2loadStats, err := RunH2load(&configForH2load, nil)
+			h2loadConf := h2load.H2loadConf{
+				ConcurrentStreams: 100,
+				Rps:               1,
+				RpsMode:           h2load.RpsModeEven,
+			}
+			h2loadStats, err := RunH2load(&configForH2load, &h2loadConf)
 			if err != nil {
 				log.Printf("h2load error: %v", err)
 			}
@@ -173,7 +179,7 @@ func RunTool(config *ToolConfig) error {
 			return fmt.Errorf("failed to run SSHMonitor: %v", err)
 		}
 	}
-
+	config.ShowProgressbar = true
 	runModeResult, err := RunMode(config)
 	if err != nil {
 		return fmt.Errorf("failed to run %s: %v", config.Mode, err)