diff options
| author | Will Hawkins <[email protected]> | 2022-06-13 19:53:44 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-13 19:53:44 -0400 |
| commit | 144a5dad1f30d538cefd1ed0904c00fc29c3d9c4 (patch) | |
| tree | 223491fac01200e49302b477e512b5f7ebccf2ae /networkQuality.go | |
| parent | c93a4dedc897f84992a6a34200fe954ba2ca435d (diff) | |
| parent | a32ace3c60721d1bae4ea77117ffd14a35b0f951 (diff) | |
Merge pull request #25 from network-quality/timeout-patch
Timeout patch
Diffstat (limited to 'networkQuality.go')
| -rw-r--r-- | networkQuality.go | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/networkQuality.go b/networkQuality.go index c7dd74b..3ba783d 100644 --- a/networkQuality.go +++ b/networkQuality.go @@ -63,10 +63,15 @@ var ( constants.DefaultStrict, "Whether to run the test in strict mode (measure HTTP get time on load-generating connection)", ) - timeout = flag.Int( - "timeout", + sattimeout = flag.Int( + "sattimeout", constants.DefaultTestTime, - "Maximum time to spend measuring.", + "Maximum time to spend measuring saturation.", + ) + rpmtimeout = flag.Int( + "rpmtimeout", + constants.RPMCalculationTime, + "Maximum time to spend calculating RPM.", ) sslKeyFileName = flag.String( "ssl-key-file", @@ -89,7 +94,7 @@ var ( func main() { flag.Parse() - timeoutDuration := time.Second * time.Duration(*timeout) + timeoutDuration := time.Second * time.Duration(*sattimeout) timeoutAbsoluteTime := time.Now().Add(timeoutDuration) configHostPort := fmt.Sprintf("%s:%d", *configHost, *configPort) operatingCtx, cancelOperatingCtx := context.WithCancel(context.Background()) @@ -273,7 +278,7 @@ func main() { // and then we will give ourselves some additional time in order // to calculate a provisional saturation. timeoutAbsoluteTime = time.Now(). - Add(constants.RPMCalculationTime) + Add(time.Second * time.Duration(*rpmtimeout)) timeoutChannel = timeoutat.TimeoutAt( operatingCtx, timeoutAbsoluteTime, @@ -293,7 +298,7 @@ func main() { // We did it up there so that we could also limit the amount of time waiting // for a conditional saturation calculation. if !saturationTimeout { - timeoutAbsoluteTime = time.Now().Add(constants.RPMCalculationTime) + timeoutAbsoluteTime = time.Now().Add(time.Second * time.Duration(*rpmtimeout)) timeoutChannel = timeoutat.TimeoutAt( operatingCtx, timeoutAbsoluteTime, |