From 99846a0b854178a663c8dab7a133221915d2c890 Mon Sep 17 00:00:00 2001 From: Morgan Bauer Date: Mon, 9 Nov 2015 14:32:52 -0800 Subject: [PATCH] add newline to event json to match docker - docker server has a newline separating individual json entries - create const string for format - resolves #1367 Signed-off-by: Morgan Bauer --- api/events.go | 4 +++- api/events_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/events.go b/api/events.go index e09d116015..a1299f63ea 100644 --- a/api/events.go +++ b/api/events.go @@ -10,6 +10,8 @@ import ( "github.com/docker/swarm/cluster" ) +const eventFmt string = "{%q:%q,%q:%q,%q:%q,%q:%d,%q:{%q:%q,%q:%q,%q:%q,%q:%q}}\n" + // EventsHandler broadcasts events to multiple client listeners. type eventsHandler struct { sync.RWMutex @@ -66,7 +68,7 @@ func (eh *eventsHandler) cleanupHandler(remoteAddr string) { func (eh *eventsHandler) Handle(e *cluster.Event) error { eh.RLock() - str := fmt.Sprintf("{%q:%q,%q:%q,%q:%q,%q:%d,%q:{%q:%q,%q:%q,%q:%q,%q:%q}}", + str := fmt.Sprintf(eventFmt, "status", e.Status, "id", e.Id, "from", e.From+" node:"+e.Engine.Name, diff --git a/api/events_test.go b/api/events_test.go index 51dcf6effb..c7c5220298 100644 --- a/api/events_test.go +++ b/api/events_test.go @@ -42,7 +42,7 @@ func TestHandle(t *testing.T) { assert.NoError(t, eh.Handle(event)) - str := fmt.Sprintf("{%q:%q,%q:%q,%q:%q,%q:%d,%q:{%q:%q,%q:%q,%q:%q,%q:%q}}", + str := fmt.Sprintf(eventFmt, "status", "status", "id", "id", "from", "from node:node_name",