From 4a2bc83c148289194dbdba2748909c8eef5ef26c Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Wed, 23 Mar 2016 19:20:08 -0700 Subject: [PATCH] Changed a log line --- client/consul/sync.go | 3 ++- client/driver/executor/executor.go | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/consul/sync.go b/client/consul/sync.go index ee18c075b..dc1410886 100644 --- a/client/consul/sync.go +++ b/client/consul/sync.go @@ -275,7 +275,8 @@ func (c *ConsulService) deregisterCheck(ID string) error { return c.client.Agent().CheckDeregister(ID) } -// PeriodicSync triggers periodic syncing of services and checks with Consul +// PeriodicSync triggers periodic syncing of services and checks with Consul. +// This is a long lived go-routine which is stopped during shutdown func (c *ConsulService) PeriodicSync() { sync := time.After(syncInterval) for { diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go index b79b988f0..77d058ad1 100644 --- a/client/driver/executor/executor.go +++ b/client/driver/executor/executor.go @@ -266,12 +266,13 @@ func (e *UniversalExecutor) UpdateTask(task *structs.Task) error { e.lre.MaxFiles = task.LogConfig.MaxFiles e.lre.FileSize = fileSize - var err error // Re-syncing task with consul service if e.consulService != nil { - err = e.consulService.SyncTask(task) + if err := e.consulService.SyncTask(task); err != nil { + return err + } } - return err + return nil } func (e *UniversalExecutor) wait() { @@ -365,7 +366,7 @@ func (e *UniversalExecutor) RegisterServices() error { } func (e *UniversalExecutor) DeregisterServices() error { - e.logger.Printf("[ERR] executor: de-registering services and shutting down consul service") + e.logger.Printf("[INFO] executor: de-registering services and shutting down consul service") if e.consulService != nil { return e.consulService.Shutdown() }