linting: gosimple fixes (#43)

cmd/root.go

@@ -34,12 +34,11 @@ func init() {
 	viper.SetConfigName("pewpew") // name of config file (without extension)
 	viper.AddConfigPath(".")      // optionally look for config in the working directory
 	err := viper.ReadInConfig()   // Find and read the config file
-	if err != nil {               // Handle errors reading the config file
-		if _, ok := err.(viper.ConfigParseError); ok {
-			fmt.Println("Failed to parse config file " + viper.ConfigFileUsed())
-			fmt.Println(err)
-			os.Exit(-1)
-		}
+	// Handle errors reading the config file
+	if _, ok := err.(viper.ConfigParseError); ok {
+		fmt.Println("Failed to parse config file " + viper.ConfigFileUsed())
+		fmt.Println(err)
+		os.Exit(-1)
 	}
 
 	if viper.ConfigFileUsed() != "" {

lib/benchmark.go

@@ -104,40 +104,36 @@ func RunBenchmark(b BenchmarkConfig, w io.Writer) ([][]RequestStat, error) {
 			secondsLeft := b.Duration
 			go func() {
 				for {
-					select {
-					case <-ticker.C:
-						secondsLeft--
-						if secondsLeft < 0 {
-							return
-						}
-						for i := 0; i < b.RPS; i++ {
-							//run all the requests at the start of the second
-							//note: this means it's a little bursty, not evenly
-							//distributed throughout the 1 second window
-							go func() {
-								req := <-requestQueue
-								response, stat := runRequest(req, client)
-								if !b.Quiet {
-									p.printStat(stat)
-									if b.Verbose {
-										p.printVerbose(&req, response)
-									}
+					<-ticker.C
+					secondsLeft--
+					if secondsLeft < 0 {
+						return
+					}
+					for i := 0; i < b.RPS; i++ {
+						//run all the requests at the start of the second
+						//note: this means it's a little bursty, not evenly
+						//distributed throughout the 1 second window
+						go func() {
+							req := <-requestQueue
+							response, stat := runRequest(req, client)
+							if !b.Quiet {
+								p.printStat(stat)
+								if b.Verbose {
+									p.printVerbose(&req, response)
 								}
-								requestStatChan <- stat
-							}()
-						}
+							}
+							requestStatChan <- stat
+						}()
 					}
 				}
 			}()
 
 			requestStats := make([]RequestStat, b.RPS*b.Duration)
 			requestsCompleteCount := 0
 			for {
-				select {
-				case stat := <-requestStatChan:
-					requestStats[requestsCompleteCount] = stat
-					requestsCompleteCount++
-				}
+				stat := <-requestStatChan
+				requestStats[requestsCompleteCount] = stat
+				requestsCompleteCount++
 				if requestsCompleteCount == b.RPS*b.Duration {
 					//all requests are finished
 					break