Browse Source

fix race condition in logging initialization. go fmt

Alan Shreve 12 years ago
parent
commit
bfd7e64d9f
2 changed files with 6 additions and 6 deletions
  1. 4 2
      src/ngrok/client/update_release.go
  2. 2 4
      src/ngrok/server/metrics.go

+ 4 - 2
src/ngrok/client/update_release.go

@@ -15,7 +15,7 @@ import (
 
 const (
 	updateEndpoint = "https://dl.ngrok.com/update"
-	checkEndpoint = "https://dl.ngrok.com/update/check"
+	checkEndpoint  = "https://dl.ngrok.com/update/check"
 )
 
 func progressWatcher(s *State, ctl *ui.Controller, progress chan int, complete chan int) {
@@ -118,6 +118,8 @@ func autoUpdate(s *State, ctl *ui.Controller, token string) {
 	// try to update immediately and then at a set interval
 	update()
 	for _ = range time.Tick(updateCheckInterval) {
-		for tryAgain { update() }
+		for tryAgain {
+			update()
+		}
 	}
 }

+ 2 - 4
src/ngrok/server/metrics.go

@@ -23,8 +23,6 @@ func init() {
 	} else {
 		metrics = NewLocalMetrics(30 * time.Second)
 	}
-
-	metrics.AddLogPrefix("metrics")
 }
 
 type Metrics interface {
@@ -63,7 +61,7 @@ type LocalMetrics struct {
 
 func NewLocalMetrics(reportInterval time.Duration) *LocalMetrics {
 	metrics := LocalMetrics{
-		Logger:         log.NewPrefixLogger(),
+		Logger:         log.NewPrefixLogger("metrics"),
 		reportInterval: reportInterval,
 		windowsCounter: gometrics.NewCounter(),
 		linuxCounter:   gometrics.NewCounter(),
@@ -171,7 +169,7 @@ type KeenIoMetrics struct {
 
 func NewKeenIoMetrics() *KeenIoMetrics {
 	k := &KeenIoMetrics{
-		Logger:       log.NewPrefixLogger(),
+		Logger:       log.NewPrefixLogger("metrics"),
 		ApiKey:       os.Getenv("KEEN_API_KEY"),
 		ProjectToken: os.Getenv("KEEN_PROJECT_TOKEN"),
 		Requests:     make(chan *KeenIoRequest, 100),