Remove schedule update channel (#30)

* Remove schedule update channel

* Remove unused func

Author: localhots

.golangci.yml

@@ -34,6 +34,7 @@ linters:
     - revive
     - stylecheck
     - unconvert
+    - unused
     - usestdlibvars
     - wastedassign
     - whitespace

datamodel/common.go

@@ -2,7 +2,6 @@ package datamodel
 
 import (
 	"strconv"
-	"strings"
 	"time"
 )
 
@@ -120,20 +119,6 @@ func (dm *DataModel) SetPeriodicInformTime(ts time.Time) {
 	dm.SetValue(pathPeriodicInformTime, ts.UTC().Format(time.RFC3339))
 }
 
-// IsPeriodicInformParameter returns true if periodic inform is configured.
-func (dm *DataModel) IsPeriodicInformParameter(name string) bool {
-	if strings.HasSuffix(name, pathPeriodicInformInterval) {
-		return true
-	}
-	if strings.HasSuffix(name, pathPeriodicInformTime) {
-		return true
-	}
-	if strings.HasSuffix(name, pathPeriodicInformEnable) {
-		return true
-	}
-	return false
-}
-
 // SetFirmwareVersion sets the new firmware version value.
 func (dm *DataModel) SetFirmwareVersion(ver string) {
 	dm.SetValue(pathSoftwareVersion, ver)

simulator/inform.go

@@ -43,7 +43,6 @@ func (s *Simulator) periodicInform(ctx context.Context) {
 		case evt := <-s.pendingEvents:
 			s.dm.AddEvent(evt)
 			s.startSession(ctx, s.informHandler)
-		case <-s.informScheduleUpdate:
 		case <-s.stop:
 			return
 		}
@@ -65,10 +64,6 @@ func (s *Simulator) nextInformTime() time.Time {
 	)
 }
 
-func (s *Simulator) resetInformTimer() {
-	s.informScheduleUpdate <- struct{}{}
-}
-
 // startSession initiates a new session with the ACS.
 func (s *Simulator) startSession(ctx context.Context, handler sessionHandler) {
 	if s.stopped() {

simulator/set_parameter_values.go

@@ -36,17 +36,6 @@ func (s *Simulator) handleSetParameterValues(envID string, r *rpc.SetParameterVa
 		return resp
 	}
 
-	var resetPeriodicInform bool
-	for _, p := range params {
-		if s.dm.IsPeriodicInformParameter(p.Path) {
-			resetPeriodicInform = true
-			break
-		}
-	}
-	if resetPeriodicInform {
-		defer s.resetInformTimer()
-	}
-
 	s.metrics.ParametersWritten.Add(float64(len(params)))
 	s.dm.SetValues(params)
 	s.dm.SetParameterKey(r.ParameterKey)

simulator/simulator.go

@@ -30,12 +30,11 @@ type Simulator struct {
 	envelopeID uint64
 	metrics    *metrics.Metrics
 
-	pendingEvents        chan string
-	pendingRequests      chan func(*rpc.EnvelopeEncoder)
-	informScheduleUpdate chan struct{}
-	stop                 chan struct{}
-	tasks                chan taskFn
-	sessionMux           sync.Mutex
+	pendingEvents   chan string
+	pendingRequests chan func(*rpc.EnvelopeEncoder)
+	stop            chan struct{}
+	tasks           chan taskFn
+	sessionMux      sync.Mutex
 }
 
 var errServiceUnavailable = errors.New("service unavailable")
@@ -44,15 +43,14 @@ var errServiceUnavailable = errors.New("service unavailable")
 func New(dm *datamodel.DataModel) *Simulator {
 	jar, _ := cookiejar.New(nil)
 	return &Simulator{
-		server:               newNoopServer(),
-		dm:                   dm,
-		cookies:              jar,
-		metrics:              metrics.NewNoop(),
-		pendingEvents:        make(chan string, 5),
-		pendingRequests:      make(chan func(*rpc.EnvelopeEncoder), 5),
-		informScheduleUpdate: make(chan struct{}, 1),
-		stop:                 make(chan struct{}),
-		tasks:                make(chan taskFn, 5),
+		server:          newNoopServer(),
+		dm:              dm,
+		cookies:         jar,
+		metrics:         metrics.NewNoop(),
+		pendingEvents:   make(chan string, 5),
+		pendingRequests: make(chan func(*rpc.EnvelopeEncoder), 5),
+		stop:            make(chan struct{}),
+		tasks:           make(chan taskFn, 5),
 	}
 }