all: check for nil PreAttack when on worker attack queue

If the HttpTarget.PreAttack is not set we should not call it.

While at it, reset the RunRequest result to nil at the end of attack.

1 files changed, 5 insertions, 2 deletions

diff --git a/trunks.go b/trunks.go
index 5cb747b..fc742c0 100644
--- a/trunks.go
+++ b/trunks.go
@@ -623,7 +623,9 @@ func (trunks *Trunks) workerAttackQueue() {
 		var err error
 		trunks.Env.AttackRunning = rr
 
-		rr.HttpTarget.PreAttack(rr)
+		if rr.HttpTarget.PreAttack != nil {
+			rr.HttpTarget.PreAttack(rr)
+		}
 
 		isCancelled := false
 		attacker := vegeta.NewAttacker(
@@ -663,7 +665,7 @@ func (trunks *Trunks) workerAttackQueue() {
 				trunks.cancelq <- true
 			}
 		} else {
-			err := rr.result.finish()
+			err = rr.result.finish()
 			if err != nil {
 				mlog.Errf("%s %s: %s\n", logp, rr.result.Name, err)
 			}
@@ -677,6 +679,7 @@ func (trunks *Trunks) workerAttackQueue() {
 			mlog.Outf("%s: %s finished.\n", logp, rr.result.Name)
 		}
 
+		rr.result = nil
 		trunks.Env.AttackRunning = nil
 	}
 }