dt1t and counter and refactoring using embedded interfaces

src/udi/handlers/dt1t/dt1t.go

@@ -11,20 +11,18 @@ import (
 )
 
 
-var idSeq int = 0
-
 type Dt1tHandler struct {
-  id int
+  handler.CommonHandler
   ready bool
+  label string
   dbh *database.DatabaseHandle
   application string
   device string
 
 }
 
-func NewDt1tHandler(config config.HandlerConfigT) handler.Handler {
+func New(id string, config config.HandlerConfigT) handler.Handler {
   t := &Dt1tHandler {
-    id: idSeq,
   }
 
   if config.Attributes["Application"] == "" {
@@ -37,39 +35,29 @@ func NewDt1tHandler(config config.HandlerConfigT) handler.Handler {
     return t
   }
   t.device = config.Attributes["Device"]
+  t.Id = id
   
-  
-  idSeq += 1
   t.dbh = database.NewDatabaseHandle()
   t.ready = true
   return t
 }
 
-func (self *Dt1tHandler) GetId() string {
-  return fmt.Sprintf("DT1T%d", self.id)
-}
-
-func lost(msg string, message handler.MessageT) {
-  log.Printf("Error: %s, message %s is lost", msg, message)
-}
-
 func (self *Dt1tHandler) Handle(message handler.MessageT) {
   if ! self.ready {
-    log.Println("Handler is not marked as ready, message %s is lost", message)
+    self.Lost("Handler is not marked as ready", nil, message)
     return
   }
-  log.Printf("Handler DT1T %d processing %s -> %s", self.id, message.Topic, message.Payload)
+  // log.Printf("Handler DT1T %d processing %s -> %s", self.id, message.Topic, message.Payload)
 
   temperature, err := strconv.Atoi(message.Payload)
   if err != nil {
-    lost(fmt.Sprintf("Invalid raw value: %s", err), message)
+    self.Lost("Invalid raw value", err, message)
     return
   }
   if temperature & 0x8000 != 0{
     temperature = ((temperature - 1) ^ 0xffff) * -1
   }
   temperatureF := float32(temperature) / 10.0
-  log.Printf("TemperatureF: %f", temperatureF)
 
   var measurement database.Measurement
   measurement.Time = time.Now()
@@ -84,8 +72,9 @@ func (self *Dt1tHandler) Handle(message handler.MessageT) {
   measurement.Values = make(map[string]database.VariableType)
   measurement.Values["Value"] = variable
 
-  log.Printf("Prepared measurement item: %s", measurement)
+  // log.Printf("Prepared measurement item: %s", measurement)
   self.dbh.StoreMeasurement(&measurement)
+  self.S()
 }