fix(pkg/sensor): use context to terminate go routines
This commit is contained in:
parent
502e3b3b1c
commit
2941f7a527
@ -11,7 +11,8 @@ import (
|
|||||||
|
|
||||||
var compression bool
|
var compression bool
|
||||||
var configFile string
|
var configFile string
|
||||||
var cleanCacheIntervall string
|
var cleanCacheInterval string
|
||||||
|
var round float64
|
||||||
|
|
||||||
var daemonCmd = &cobra.Command{
|
var daemonCmd = &cobra.Command{
|
||||||
Use: "daemon",
|
Use: "daemon",
|
||||||
@ -23,12 +24,12 @@ var daemonCmd = &cobra.Command{
|
|||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
duration, err := time.ParseDuration(cleanCacheIntervall)
|
duration, err := time.ParseDuration(cleanCacheInterval)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Can not parse clean cache interval into duration time: %v", err)
|
log.Fatalf("Can not parse clean cache interval into duration time: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = daemon.Start(cnf, duration, compression)
|
err = daemon.Start(cnf, duration, compression, round)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
@ -40,6 +41,6 @@ func InitCmd(cmd *cobra.Command, cnfFile string) {
|
|||||||
configFile = cnfFile
|
configFile = cnfFile
|
||||||
cmd.AddCommand(daemonCmd)
|
cmd.AddCommand(daemonCmd)
|
||||||
daemonCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values")
|
daemonCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values")
|
||||||
daemonCmd.Flags().StringVar(&cleanCacheIntervall, "clean-cache-intervall", "30m", "Minute intervall to clean cache and write measured values into logfile")
|
daemonCmd.Flags().StringVar(&cleanCacheInterval, "clean-cache-interval", "5m", "Minute intervall to clean cache and write measured values into logfile")
|
||||||
|
daemonCmd.Flags().Float64Var(&round, "round", 0.25, "Round values. The value 0 deactivates the function")
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ import (
|
|||||||
|
|
||||||
var compression bool
|
var compression bool
|
||||||
var logs bool
|
var logs bool
|
||||||
|
var round float64
|
||||||
|
|
||||||
var readTemperatureCmd = &cobra.Command{
|
var readTemperatureCmd = &cobra.Command{
|
||||||
Use: "read",
|
Use: "read",
|
||||||
@ -35,8 +36,7 @@ var readTemperatureCmd = &cobra.Command{
|
|||||||
temperatureSensors = cnf.GetTemperatureSensorsByName(args)
|
temperatureSensors = cnf.GetTemperatureSensorsByName(args)
|
||||||
}
|
}
|
||||||
|
|
||||||
// read temperature from sensors
|
temperatures, err := sensor.ReadTemperatures(temperatureSensors, round)
|
||||||
temperatures, err := sensor.ReadTemperatures(temperatureSensors)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
@ -55,6 +55,7 @@ var readTemperatureCmd = &cobra.Command{
|
|||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
temperatureCmd.AddCommand(readTemperatureCmd)
|
temperatureCmd.AddCommand(readTemperatureCmd)
|
||||||
readTemperatureCmd.Flags().BoolVarP(&logs, "logs", "l", true, "Log temperature")
|
readTemperatureCmd.Flags().BoolVar(&logs, "logs", true, "Log temperature")
|
||||||
readTemperatureCmd.Flags().BoolVarP(&compression, "compression", "c", true, "Compress measured with logged temperatures")
|
readTemperatureCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured with logged temperatures")
|
||||||
|
readTemperatureCmd.Flags().Float64VarP(&round, "round", "r", 0.25, "Round values. The value 0 deactivates the function")
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package daemon
|
package daemon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
@ -9,6 +10,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-flucky/flucky/pkg/config"
|
"github.com/go-flucky/flucky/pkg/config"
|
||||||
|
"github.com/go-flucky/flucky/pkg/internal/collect"
|
||||||
|
"github.com/go-flucky/flucky/pkg/internal/prittyprint"
|
||||||
"github.com/go-flucky/flucky/pkg/logfile"
|
"github.com/go-flucky/flucky/pkg/logfile"
|
||||||
"github.com/go-flucky/flucky/pkg/rgbled"
|
"github.com/go-flucky/flucky/pkg/rgbled"
|
||||||
"github.com/go-flucky/flucky/pkg/sensor"
|
"github.com/go-flucky/flucky/pkg/sensor"
|
||||||
@ -16,7 +19,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Start the daemon
|
// Start the daemon
|
||||||
func Start(cnf *config.Configuration, cleanCacheIntervall time.Duration, compression bool) error {
|
func Start(cnf *config.Configuration, cleanCacheIntervall time.Duration, compression bool, round float64) error {
|
||||||
|
|
||||||
ticker := time.Tick(cleanCacheIntervall)
|
ticker := time.Tick(cleanCacheIntervall)
|
||||||
|
|
||||||
@ -27,14 +30,18 @@ func Start(cnf *config.Configuration, cleanCacheIntervall time.Duration, compres
|
|||||||
//humidityChannel := make(chan *types.Humidity, 0)
|
//humidityChannel := make(chan *types.Humidity, 0)
|
||||||
temperatureChannel := make(chan *types.Temperature, 0)
|
temperatureChannel := make(chan *types.Temperature, 0)
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
childContext, cancel := context.WithCancel(ctx)
|
||||||
|
|
||||||
// go sensor.ReadHumiditiesContinuously(cnf.GetHumiditySensors(config.ENABLED), humidityChannel, errorChannel)
|
// go sensor.ReadHumiditiesContinuously(cnf.GetHumiditySensors(config.ENABLED), humidityChannel, errorChannel)
|
||||||
go sensor.ReadTemperaturesContinuously(cnf.GetTemperatureSensors(config.ENABLED), temperatureChannel, errorChannel)
|
go sensor.ReadTemperaturesContinuously(childContext, cnf.GetTemperatureSensors(config.ENABLED), temperatureChannel, errorChannel)
|
||||||
|
|
||||||
temperatures := make([]*types.Temperature, 0)
|
temperatures := make([]*types.Temperature, 0)
|
||||||
|
|
||||||
rgbLEDs := cnf.GetRGBLEDs(config.ENABLED)
|
rgbLEDs := cnf.GetRGBLEDs(config.ENABLED)
|
||||||
err := rgbled.Green(rgbLEDs)
|
err := rgbled.Green(rgbLEDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
cancel()
|
||||||
return fmt.Errorf("Can not turn on blue info light: %v", err)
|
return fmt.Errorf("Can not turn on blue info light: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -43,43 +50,50 @@ func Start(cnf *config.Configuration, cleanCacheIntervall time.Duration, compres
|
|||||||
case <-ticker:
|
case <-ticker:
|
||||||
err := rgbled.Blue(rgbLEDs)
|
err := rgbled.Blue(rgbLEDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
cancel()
|
||||||
return fmt.Errorf("Can not turn on yellow info light: %v", err)
|
return fmt.Errorf("Can not turn on yellow info light: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("Write measured values into logfile")
|
|
||||||
|
|
||||||
log.Printf("%v new measured temperature values", len(temperatures))
|
|
||||||
err = logfile.WriteTemperatures(temperatures, cnf.Device.TemperatureLogfile, compression)
|
err = logfile.WriteTemperatures(temperatures, cnf.Device.TemperatureLogfile, compression)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
cancel()
|
||||||
return fmt.Errorf("Can not save temperatures: %v", err)
|
return fmt.Errorf("Can not save temperatures: %v", err)
|
||||||
}
|
}
|
||||||
temperatures = make([]*types.Temperature, 0)
|
temperatures = make([]*types.Temperature, 0)
|
||||||
|
|
||||||
err = rgbled.Green(rgbLEDs)
|
err = rgbled.Green(rgbLEDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
cancel()
|
||||||
return fmt.Errorf("Can not turn on green info light: %v", err)
|
return fmt.Errorf("Can not turn on green info light: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
case temperature, more := <-temperatureChannel:
|
case temperature, more := <-temperatureChannel:
|
||||||
if more {
|
if more {
|
||||||
temperatures = append(temperatures, temperature)
|
temperatures = append(temperatures, temperature)
|
||||||
} else {
|
continue
|
||||||
log.Printf("Temperature Channel closed. Write remaining values into the logfile")
|
|
||||||
err := logfile.WriteTemperatures(temperatures, cnf.Device.TemperatureLogfile, compression)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Can not save temperatures: %v", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
case killSignal := <-interrupt:
|
case killSignal := <-interrupt:
|
||||||
|
log.Printf("Daemon was interruped by system signal %v\n", killSignal)
|
||||||
|
|
||||||
|
cancel()
|
||||||
|
|
||||||
err := rgbled.Red(rgbLEDs)
|
err := rgbled.Red(rgbLEDs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Can not turn on info light: %v", err)
|
return fmt.Errorf("Can not turn on info light: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
//close(humidityChannel)
|
errors := collect.Errors(errorChannel)
|
||||||
close(temperatureChannel)
|
if len(errors) > 0 {
|
||||||
return fmt.Errorf("Daemon was interruped by system signal %v", killSignal)
|
log.Println(prittyprint.FormatErrors(errors))
|
||||||
|
}
|
||||||
|
|
||||||
|
err = logfile.WriteTemperatures(temperatures, cnf.Device.TemperatureLogfile, compression)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Can not save temperatures: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,13 @@ import "fmt"
|
|||||||
func FormatErrors(errors []error) error {
|
func FormatErrors(errors []error) error {
|
||||||
if len(errors) > 0 {
|
if len(errors) > 0 {
|
||||||
errMsg := ""
|
errMsg := ""
|
||||||
for _, err := range errors {
|
for i, err := range errors {
|
||||||
|
if i == 0 {
|
||||||
|
errMsg = fmt.Sprintf("%v", err.Error())
|
||||||
|
} else {
|
||||||
errMsg = fmt.Sprintf("%v\n%v", errMsg, err.Error())
|
errMsg = fmt.Sprintf("%v\n%v", errMsg, err.Error())
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return fmt.Errorf(errMsg)
|
return fmt.Errorf(errMsg)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -181,6 +181,7 @@ func WriteTemperatures(temperatures []*types.Temperature, temperatureLogfile str
|
|||||||
// custom writer. Compression can be enabled over a bolean parameter
|
// custom writer. Compression can be enabled over a bolean parameter
|
||||||
func WriteTemperaturesCustom(temperatures []*types.Temperature, w io.Writer, compression bool) error {
|
func WriteTemperaturesCustom(temperatures []*types.Temperature, w io.Writer, compression bool) error {
|
||||||
|
|
||||||
|
// CompressTemperature
|
||||||
if compression {
|
if compression {
|
||||||
temperatures = CompressTemperature(temperatures)
|
temperatures = CompressTemperature(temperatures)
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
package sensor
|
package sensor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-flucky/flucky/pkg/types"
|
"github.com/go-flucky/flucky/pkg/types"
|
||||||
@ -52,6 +54,33 @@ func (s *DHT11) ReadHumidity() (*types.Humidity, error) {
|
|||||||
return humidity, nil
|
return humidity, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReadHumidityWriteIntoChannel and write values into a channel
|
||||||
|
func (s *DHT11) ReadHumidityWriteIntoChannel(humidityChannel chan<- *types.Humidity, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||||
|
if wg != nil {
|
||||||
|
defer wg.Done()
|
||||||
|
}
|
||||||
|
|
||||||
|
humidity, err := s.ReadHumidity()
|
||||||
|
if err != nil {
|
||||||
|
errorChannel <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
humidityChannel <- humidity
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadHumidityContinously into a channel until context closed
|
||||||
|
func (s *DHT11) ReadHumidityContinously(ctx context.Context, humidityChannel chan<- *types.Humidity, errorChannel chan<- error) {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
errorChannel <- fmt.Errorf("%v: Context closed: %v", s.SensorName, ctx.Err())
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
s.ReadHumidityWriteIntoChannel(humidityChannel, errorChannel, nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ReadTemperature measure the temperature
|
// ReadTemperature measure the temperature
|
||||||
func (s *DHT11) ReadTemperature() (*types.Temperature, error) {
|
func (s *DHT11) ReadTemperature() (*types.Temperature, error) {
|
||||||
err := dht.HostInit()
|
err := dht.HostInit()
|
||||||
@ -84,3 +113,30 @@ func (s *DHT11) ReadTemperature() (*types.Temperature, error) {
|
|||||||
|
|
||||||
return temperature, nil
|
return temperature, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReadTemperatureWriteIntoChannel and write values into a channel
|
||||||
|
func (s *DHT11) ReadTemperatureWriteIntoChannel(temperatureChannel chan<- *types.Temperature, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||||
|
if wg != nil {
|
||||||
|
defer wg.Done()
|
||||||
|
}
|
||||||
|
|
||||||
|
temperature, err := s.ReadTemperature()
|
||||||
|
if err != nil {
|
||||||
|
errorChannel <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
temperatureChannel <- temperature
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadTemperatureContinously into a channel until context closed
|
||||||
|
func (s *DHT11) ReadTemperatureContinously(ctx context.Context, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error) {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
errorChannel <- fmt.Errorf("%v: Context closed: %v", s.SensorName, ctx.Err())
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
s.ReadTemperatureWriteIntoChannel(temperatureChannel, errorChannel, nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
package sensor
|
package sensor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-flucky/flucky/pkg/types"
|
"github.com/go-flucky/flucky/pkg/types"
|
||||||
@ -52,6 +54,33 @@ func (s *DHT22) ReadHumidity() (*types.Humidity, error) {
|
|||||||
return humidity, nil
|
return humidity, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReadHumidityWriteIntoChannel and write values into a channel
|
||||||
|
func (s *DHT22) ReadHumidityWriteIntoChannel(humidityChannel chan<- *types.Humidity, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||||
|
if wg != nil {
|
||||||
|
defer wg.Done()
|
||||||
|
}
|
||||||
|
|
||||||
|
humidity, err := s.ReadHumidity()
|
||||||
|
if err != nil {
|
||||||
|
errorChannel <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
humidityChannel <- humidity
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadHumidityContinously into a channel until context closed
|
||||||
|
func (s *DHT22) ReadHumidityContinously(ctx context.Context, humidityChannel chan<- *types.Humidity, errorChannel chan<- error) {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
errorChannel <- fmt.Errorf("%v: Context closed: %v", s.SensorName, ctx.Err())
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
s.ReadHumidityWriteIntoChannel(humidityChannel, errorChannel, nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ReadTemperature measure the temperature
|
// ReadTemperature measure the temperature
|
||||||
func (s *DHT22) ReadTemperature() (*types.Temperature, error) {
|
func (s *DHT22) ReadTemperature() (*types.Temperature, error) {
|
||||||
err := dht.HostInit()
|
err := dht.HostInit()
|
||||||
@ -84,3 +113,30 @@ func (s *DHT22) ReadTemperature() (*types.Temperature, error) {
|
|||||||
|
|
||||||
return temperature, nil
|
return temperature, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReadTemperatureWriteIntoChannel and write values into a channel
|
||||||
|
func (s *DHT22) ReadTemperatureWriteIntoChannel(temperatureChannel chan<- *types.Temperature, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||||
|
if wg != nil {
|
||||||
|
defer wg.Done()
|
||||||
|
}
|
||||||
|
|
||||||
|
temperature, err := s.ReadTemperature()
|
||||||
|
if err != nil {
|
||||||
|
errorChannel <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
temperatureChannel <- temperature
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadTemperatureContinously into a channel until context closed
|
||||||
|
func (s *DHT22) ReadTemperatureContinously(ctx context.Context, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error) {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
errorChannel <- fmt.Errorf("%v: Context closed: %v", s.SensorName, ctx.Err())
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
s.ReadTemperatureWriteIntoChannel(temperatureChannel, errorChannel, nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,12 +1,17 @@
|
|||||||
package sensor
|
package sensor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-flucky/flucky/pkg/types"
|
"github.com/go-flucky/flucky/pkg/types"
|
||||||
uuid "github.com/satori/go.uuid"
|
uuid "github.com/satori/go.uuid"
|
||||||
"github.com/yryz/ds18b20"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// DS18B20 is a sensor to measure humidity and temperature.
|
// DS18B20 is a sensor to measure humidity and temperature.
|
||||||
@ -27,14 +32,26 @@ func (s *DS18B20) GetSensor() *types.Sensor {
|
|||||||
// ReadTemperature measure the temperature
|
// ReadTemperature measure the temperature
|
||||||
func (s *DS18B20) ReadTemperature() (*types.Temperature, error) {
|
func (s *DS18B20) ReadTemperature() (*types.Temperature, error) {
|
||||||
|
|
||||||
t, err := ds18b20.Temperature(*s.WireID)
|
data, err := ioutil.ReadFile(filepath.Join("/sys/bus/w1/devices", *s.WireID, "/w1_slave"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("Can not read from Sensor %v (UUID: %v, Wire-ID: %v): %v", s.SensorName, s.SensorID, s.WireID, err)
|
return nil, fmt.Errorf("Can not read data from sensor %v", s.SensorName)
|
||||||
|
}
|
||||||
|
|
||||||
|
raw := string(data)
|
||||||
|
|
||||||
|
i := strings.LastIndex(raw, "t=")
|
||||||
|
if i == -1 {
|
||||||
|
return nil, ErrReadSensor
|
||||||
|
}
|
||||||
|
|
||||||
|
celsius, err := strconv.ParseFloat(raw[i+2:len(raw)-1], 64)
|
||||||
|
if err != nil {
|
||||||
|
return nil, ErrParseData
|
||||||
}
|
}
|
||||||
|
|
||||||
temperature := &types.Temperature{
|
temperature := &types.Temperature{
|
||||||
TemperatureID: uuid.NewV4().String(),
|
TemperatureID: uuid.NewV4().String(),
|
||||||
TemperatureValue: t,
|
TemperatureValue: celsius / 1000,
|
||||||
TemperatureFromDate: time.Now(),
|
TemperatureFromDate: time.Now(),
|
||||||
TemperatureTillDate: time.Now(),
|
TemperatureTillDate: time.Now(),
|
||||||
SensorID: s.SensorID,
|
SensorID: s.SensorID,
|
||||||
@ -43,3 +60,30 @@ func (s *DS18B20) ReadTemperature() (*types.Temperature, error) {
|
|||||||
return temperature, nil
|
return temperature, nil
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ReadTemperatureWriteIntoChannel and write values into a channel
|
||||||
|
func (s *DS18B20) ReadTemperatureWriteIntoChannel(temperatureChannel chan<- *types.Temperature, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||||
|
if wg != nil {
|
||||||
|
defer wg.Done()
|
||||||
|
}
|
||||||
|
|
||||||
|
temperature, err := s.ReadTemperature()
|
||||||
|
if err != nil {
|
||||||
|
errorChannel <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
temperatureChannel <- temperature
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadTemperatureContinously into a channel until context closed
|
||||||
|
func (s *DS18B20) ReadTemperatureContinously(ctx context.Context, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error) {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
errorChannel <- fmt.Errorf("%v: Context closed: %v", s.SensorName, ctx.Err())
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
s.ReadTemperatureWriteIntoChannel(temperatureChannel, errorChannel, nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
8
pkg/sensor/error.go
Normal file
8
pkg/sensor/error.go
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
package sensor
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ErrParseData = errors.New("Can not parse data")
|
||||||
|
var ErrReadSensor = errors.New("Can not read data from Sensor")
|
@ -1,15 +1,24 @@
|
|||||||
package sensor
|
package sensor
|
||||||
|
|
||||||
import "github.com/go-flucky/flucky/pkg/types"
|
import (
|
||||||
|
"context"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/go-flucky/flucky/pkg/types"
|
||||||
|
)
|
||||||
|
|
||||||
// HumiditySensor is a interface to describe required functions to measure humidities
|
// HumiditySensor is a interface to describe required functions to measure humidities
|
||||||
type HumiditySensor interface {
|
type HumiditySensor interface {
|
||||||
GetSensorModel() types.SensorModel
|
GetSensorModel() types.SensorModel
|
||||||
ReadHumidity() (*types.Humidity, error)
|
ReadHumidity() (*types.Humidity, error)
|
||||||
|
ReadHumidityWriteIntoChannel(humidityChannel chan<- *types.Humidity, errorChannel chan<- error, wg *sync.WaitGroup)
|
||||||
|
ReadHumidityContinously(ctx context.Context, humidityChannel chan<- *types.Humidity, errorChannel chan<- error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TemperatureSensor is a interface to describe required functions to measure temperatures
|
// TemperatureSensor is a interface to describe required functions to measure temperatures
|
||||||
type TemperatureSensor interface {
|
type TemperatureSensor interface {
|
||||||
GetSensorModel() types.SensorModel
|
GetSensorModel() types.SensorModel
|
||||||
ReadTemperature() (*types.Temperature, error)
|
ReadTemperature() (*types.Temperature, error)
|
||||||
|
ReadTemperatureWriteIntoChannel(temperatureChannel chan<- *types.Temperature, errorChannel chan<- error, wg *sync.WaitGroup)
|
||||||
|
ReadTemperatureContinously(ctx context.Context, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error)
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
package sensor
|
package sensor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/go-flucky/flucky/pkg/internal/collect"
|
"github.com/go-flucky/flucky/pkg/internal/collect"
|
||||||
@ -9,81 +12,102 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// ReadHumidities returns a list of measured humidities by humidity sensors
|
// ReadHumidities returns a list of measured humidities by humidity sensors
|
||||||
func ReadHumidities(humiditySensors []HumiditySensor) ([]*types.Humidity, error) {
|
func ReadHumidities(humiditySensors []HumiditySensor, round float64) ([]*types.Humidity, error) {
|
||||||
errorChannel := make(chan error, len(humiditySensors))
|
|
||||||
humidityChannel := make(chan *types.Humidity, len(humiditySensors))
|
humidityChannel := make(chan *types.Humidity, len(humiditySensors))
|
||||||
ReadHumiditiesIntoChannel(humiditySensors, humidityChannel, errorChannel)
|
errorChannel := make(chan error, len(humiditySensors))
|
||||||
|
|
||||||
errorList := collect.Errors(errorChannel)
|
|
||||||
if len(errorList) != 0 {
|
|
||||||
return nil, prittyprint.FormatErrors(errorList)
|
|
||||||
}
|
|
||||||
|
|
||||||
humidityList := collect.Humidities(humidityChannel)
|
|
||||||
return humidityList, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReadHumiditiesIntoChannel reads the humidity values of humidity sensors and writes them into a channel
|
|
||||||
func ReadHumiditiesIntoChannel(humiditySensors []HumiditySensor, humidityChannel chan<- *types.Humidity, errorChannel chan<- error) {
|
|
||||||
wg := new(sync.WaitGroup)
|
wg := new(sync.WaitGroup)
|
||||||
wg.Add(len(humiditySensors))
|
wg.Add(len(humiditySensors))
|
||||||
|
|
||||||
for _, humiditySensor := range humiditySensors {
|
for _, humiditySensor := range humiditySensors {
|
||||||
go func(hs HumiditySensor) {
|
go humiditySensor.ReadHumidityWriteIntoChannel(humidityChannel, errorChannel, wg)
|
||||||
defer wg.Done()
|
|
||||||
humidity, err := hs.ReadHumidity()
|
|
||||||
if err != nil {
|
|
||||||
errorChannel <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
humidityChannel <- humidity
|
|
||||||
}(humiditySensor)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
|
errors := collect.Errors(errorChannel)
|
||||||
|
if len(errors) > 0 {
|
||||||
|
return nil, prittyprint.FormatErrors(errors)
|
||||||
|
}
|
||||||
|
|
||||||
|
humidities := collect.Humidities(humidityChannel)
|
||||||
|
|
||||||
|
if round != 0 {
|
||||||
|
for _, humidity := range humidities {
|
||||||
|
humidity.HumidityValue = math.Round(humidity.HumidityValue/round) * round
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return humidities, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadHumiditiesWriteIntoChannel reads the humidity values of humidity sensors and writes them into a channel
|
||||||
|
func ReadHumiditiesWriteIntoChannel(ctx context.Context, humiditySensors []HumiditySensor, humidityChannel chan<- *types.Humidity, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||||
|
for _, humiditySensor := range humiditySensors {
|
||||||
|
humiditySensor.ReadHumidityWriteIntoChannel(humidityChannel, errorChannel, wg)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadHumiditiesContinuously reads the humidity values of humidity sensors continuously and writes them into a channel
|
// ReadHumiditiesContinuously reads the humidity values of humidity sensors continuously and writes them into a channel
|
||||||
func ReadHumiditiesContinuously(humiditySensors []HumiditySensor, humidityChannel chan<- *types.Humidity, errorChannel chan<- error) {
|
func ReadHumiditiesContinuously(ctx context.Context, humiditySensors []HumiditySensor, humidityChannel chan<- *types.Humidity, errorChannel chan<- error) {
|
||||||
for {
|
for {
|
||||||
ReadHumiditiesIntoChannel(humiditySensors, humidityChannel, errorChannel)
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
errorChannel <- fmt.Errorf("Context closed: %v", ctx.Err())
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
ReadHumiditiesWriteIntoChannel(ctx, humiditySensors, humidityChannel, errorChannel, nil)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadTemperatures returns a list of measured temperatures by temperature sensors
|
// ReadTemperatures returns a list of measured temperatures by temperature sensors
|
||||||
func ReadTemperatures(temperatureSensors []TemperatureSensor) ([]*types.Temperature, error) {
|
func ReadTemperatures(temperatureSensors []TemperatureSensor, round float64) ([]*types.Temperature, error) {
|
||||||
errorChannel := make(chan error, len(temperatureSensors))
|
|
||||||
temperatureChannel := make(chan *types.Temperature, len(temperatureSensors))
|
temperatureChannel := make(chan *types.Temperature, len(temperatureSensors))
|
||||||
ReadTemperaturesIntoChannel(temperatureSensors, temperatureChannel, errorChannel)
|
errorChannel := make(chan error, len(temperatureSensors))
|
||||||
|
|
||||||
errorList := collect.Errors(errorChannel)
|
|
||||||
if len(errorList) != 0 {
|
|
||||||
return nil, prittyprint.FormatErrors(errorList)
|
|
||||||
}
|
|
||||||
|
|
||||||
temperatureList := collect.Temperatures(temperatureChannel)
|
|
||||||
return temperatureList, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReadTemperaturesIntoChannel reads the temperature values of temperature sensors and writes them into a channel
|
|
||||||
func ReadTemperaturesIntoChannel(temperatureSensors []TemperatureSensor, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error) {
|
|
||||||
wg := new(sync.WaitGroup)
|
wg := new(sync.WaitGroup)
|
||||||
wg.Add(len(temperatureSensors))
|
wg.Add(len(temperatureSensors))
|
||||||
|
|
||||||
for _, temperatureSensor := range temperatureSensors {
|
for _, temperatureSensor := range temperatureSensors {
|
||||||
go func(ts TemperatureSensor) {
|
go temperatureSensor.ReadTemperatureWriteIntoChannel(temperatureChannel, errorChannel, wg)
|
||||||
defer wg.Done()
|
|
||||||
temperature, err := ts.ReadTemperature()
|
|
||||||
if err != nil {
|
|
||||||
errorChannel <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
temperatureChannel <- temperature
|
|
||||||
}(temperatureSensor)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
|
errors := collect.Errors(errorChannel)
|
||||||
|
if len(errors) > 0 {
|
||||||
|
return nil, prittyprint.FormatErrors(errors)
|
||||||
|
}
|
||||||
|
|
||||||
|
temperatures := collect.Temperatures(temperatureChannel)
|
||||||
|
|
||||||
|
if round != 0 {
|
||||||
|
for _, temperature := range temperatures {
|
||||||
|
temperature.TemperatureValue = math.Round(temperature.TemperatureValue/round) * round
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return temperatures, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadTemperaturesWriteIntoChannel reads the temperature values of temperature sensors and writes them into a channel
|
||||||
|
func ReadTemperaturesWriteIntoChannel(ctx context.Context, temperatureSensors []TemperatureSensor, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||||
|
for _, temperatureSensor := range temperatureSensors {
|
||||||
|
temperatureSensor.ReadTemperatureWriteIntoChannel(temperatureChannel, errorChannel, wg)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadTemperaturesContinuously reads the temperature values of temperature sensors continuously and writes them into a chann
|
// ReadTemperaturesContinuously reads the temperature values of temperature sensors continuously and writes them into a chann
|
||||||
func ReadTemperaturesContinuously(temperatureSensors []TemperatureSensor, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error) {
|
func ReadTemperaturesContinuously(ctx context.Context, temperatureSensors []TemperatureSensor, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error) {
|
||||||
for {
|
for {
|
||||||
ReadTemperaturesIntoChannel(temperatureSensors, temperatureChannel, errorChannel)
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
errorChannel <- fmt.Errorf("Context closed: %v", ctx.Err())
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
ReadTemperaturesWriteIntoChannel(ctx, temperatureSensors, temperatureChannel, errorChannel, nil)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user