Merge branch 'develop' of github.com:ClusterCockpit/cc-metric-collector into develop

internal/metricRouter/metricRouter.go

@@ -101,6 +101,7 @@ func (r *metricRouter) StartTimer() {
 		for {
 			select {
 			case <-r.timerdone:
+				close(r.timerdone)
 				cclog.ComponentDebug("MetricRouter", "TIMER DONE")
 				return
 			case t := <-m:
@@ -195,6 +196,7 @@ func (r *metricRouter) Start() {
 
 	// Router manager is done
 	done := func() {
+		close(r.done)
 		cclog.ComponentDebug("MetricRouter", "DONE")
 	}
 
@@ -257,9 +259,13 @@ func (r *metricRouter) AddOutput(output chan lp.CCMetric) {
 func (r *metricRouter) Close() {
 	cclog.ComponentDebug("MetricRouter", "CLOSE")
 	r.done <- true
+	// wait for close of channel r.done
+	<-r.done
 	if r.config.IntervalStamp {
 		cclog.ComponentDebug("MetricRouter", "TIMER CLOSE")
 		r.timerdone <- true
+		// wait for close of channel r.timerdone
+		<-r.timerdone
 	}
 }
 

internal/multiChanTicker/multiChanTicker.go

@@ -23,6 +23,7 @@ func (t *multiChanTicker) Init(duration time.Duration) {
 	t.done = make(chan bool)
 	go func() {
 		done := func() {
+			close(t.done)
 			cclog.ComponentDebug("MultiChanTicker", "DONE")
 		}
 		for {
@@ -52,6 +53,8 @@ func (t *multiChanTicker) AddChannel(channel chan time.Time) {
 func (t *multiChanTicker) Close() {
 	cclog.ComponentDebug("MultiChanTicker", "CLOSE")
 	t.done <- true
+	// wait for close of channel t.done
+	<-t.done
 }
 
 func NewTicker(duration time.Duration) MultiChanTicker {