Commit f779013b authored by Cecylia Bocovich's avatar Cecylia Bocovich 💬
Browse files

Fixed small formatting errors of log output 

- removed trailing ","s
- removed unecessary space before seconds
parent 0767a637

broker/metrics.go

+7 −1
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ func (s CountryStats) Display() string { 
	for cc, count := range s.counts {

		output += fmt.Sprintf("%s=%d,", cc, count)

	}



	// cut off trailing ","

	if len(output) > 0 {

		return output[:len(output)-1]

	}



	return output

}
@@ -163,7 +169,7 @@ func (m *Metrics) logMetrics() { 
}



func (m *Metrics) printMetrics() {

	m.logger.Println("snowflake-stats-end", time.Now().UTC().Format("2006-01-02 15:04:05"), "(", int(metricsResolution.Seconds()), "s)")

	m.logger.Println("snowflake-stats-end", time.Now().UTC().Format("2006-01-02 15:04:05"), fmt.Sprintf("(%d s)", int(metricsResolution.Seconds())))

	m.logger.Println("snowflake-ips", m.countryStats.Display())

	m.logger.Println("snowflake-idle-count", binCount(m.proxyIdleCount))

	m.logger.Println("client-denied-count", binCount(m.clientDeniedCount))

broker/snowflake-broker_test.go

+7 −7
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ func TestMetrics(t *testing.T) { 
			<-done



			ctx.metrics.printMetrics()

			So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" ( 86400 s)\nsnowflake-ips CA=1,\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n")

			So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=1\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n")

		})



		//Test addition of client failures
@@ -515,7 +515,7 @@ func TestMetrics(t *testing.T) { 
			<-done



			ctx.metrics.printMetrics()

			So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" ( 86400 s)\nsnowflake-ips CA=1,\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n")

			So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=1\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n")

		})

	})

}