From 08db309f8010a93085ad4a87520cdf15e3bef2e3 Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Mon, 25 Jan 2016 01:39:38 +0300 Subject: [PATCH] Export daemon String function --- daemon.go | 3 +++ shezmu.go | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/daemon.go b/daemon.go index 862d38e..15ee5c3 100644 --- a/daemon.go +++ b/daemon.go @@ -37,6 +37,9 @@ type Daemon interface { // close channels, process the last batch of items, etc. Shutdown() + // String returns the name of a daemon. + String() string + // base is a (hack) function that allows the Daemon interface to reference // underlying BaseDaemon structure. base() *BaseDaemon diff --git a/shezmu.go b/shezmu.go index ff5942f..8fb39cf 100644 --- a/shezmu.go +++ b/shezmu.go @@ -185,15 +185,15 @@ func (s *Shezmu) processSystemTask(t *task) { func (s *Shezmu) processGeneralTask(t *task) { defer func() { if err := recover(); err != nil { - s.DaemonStats.Error(t.daemon.base().String()) + s.DaemonStats.Error(t.daemon.String()) t.daemon.base().handlePanic(err) - s.Logger.Printf("Daemon %s recovered from a panic\nError: %v\n", t.daemon.base(), err) + s.Logger.Printf("Daemon %s recovered from a panic\nError: %v\n", t.daemon, err) debug.PrintStack() } }() defer func(start time.Time) { dur := time.Now().Sub(start) - s.DaemonStats.Add(t.daemon.base().String(), dur) + s.DaemonStats.Add(t.daemon.String(), dur) }(time.Now()) t.actor() // <--- ACTION STARTS HERE