diff --git a/bin/go-proxy b/bin/go-proxy index 4038d9cc..4d15f7db 100755 Binary files a/bin/go-proxy and b/bin/go-proxy differ diff --git a/src/go-proxy/docker_provider.go b/src/go-proxy/docker_provider.go index e4e1cc3a..da41376a 100755 --- a/src/go-proxy/docker_provider.go +++ b/src/go-proxy/docker_provider.go @@ -193,7 +193,7 @@ func (p *Provider) grWatchDockerChanges() { return case msg := <-msgChan: // TODO: handle actor only - p.Logf("Event", "%s %s caused rebuild", msg.Action, msg.Actor.Attributes["name"]) + p.Logf("Event", "container %s %s caused rebuild", msg.Actor.Attributes["name"], msg.Action) p.StopAllRoutes() p.BuildStartRoutes() case err := <-errChan: diff --git a/src/go-proxy/file_provider.go b/src/go-proxy/file_provider.go index 611bd187..203445ee 100644 --- a/src/go-proxy/file_provider.go +++ b/src/go-proxy/file_provider.go @@ -62,16 +62,16 @@ func (p *Provider) grWatchFileChanges() { } switch { case event.Has(fsnotify.Write): - p.Logf("Watcher", "file change detected", p.name) + p.Logf("Watcher", "file change detected") p.StopAllRoutes() p.BuildStartRoutes() case event.Has(fsnotify.Remove), event.Has(fsnotify.Rename): - p.Logf("Watcher", "file renamed / deleted", p.name) + p.Logf("Watcher", "file renamed / deleted") p.StopAllRoutes() } case err := <-watcher.Errors: time.Sleep(100 * time.Millisecond) - p.Errorf("Watcher", "File watcher error: %s", p.name, err) + p.Errorf("Watcher", "File watcher error: %s", err) } } } diff --git a/src/go-proxy/provider.go b/src/go-proxy/provider.go index f3c220e7..43143b21 100644 --- a/src/go-proxy/provider.go +++ b/src/go-proxy/provider.go @@ -34,7 +34,7 @@ func (p *Provider) GetProxyConfigs() ([]*ProxyConfig, error) { func (p *Provider) StopAllRoutes() { p.mutex.Lock() defer p.mutex.Unlock() - + if p.stopWatching == nil { return } diff --git a/src/go-proxy/stream_route.go b/src/go-proxy/stream_route.go index 6648c4cc..769dbbd8 100755 --- a/src/go-proxy/stream_route.go +++ b/src/go-proxy/stream_route.go @@ -153,7 +153,7 @@ func (route *StreamRouteBase) SetupListen() { return } route.ListeningPort = freePort - route.Logf("Assigned free port %s", route.ListeningPort) + route.Logf("Assigned free port %v", route.ListeningPort) } route.Logf("Listening on %s", route.ListeningUrl()) }