Add status handler

thermostat.go

@@ -12,11 +12,11 @@ import (
 
 // State represents the current state of the thermostat
 type State struct {
-	ID      string
+	Alias   string    `json:"alias"`
-	Temp    float64
+	Temp    float64   `json:"temp"`
-	Cooling bool
+	Cooling bool      `json:"cooling"`
-	Heating bool
+	Heating bool      `json:"heating"`
-	Changed time.Time
+	Changed time.Time `json:"changed"`
 }
 
 // ReadTemperature will return the current temperature (in degrees celsius) of a specific sensor.
@@ -54,7 +54,7 @@ func PinSwitch(pin rpio.Pin, on bool, invert bool) {
 // RunThermostat monitors the temperature of the supplied sensor and does its best to keep it at the desired state.
 func RunThermostat(sensor Sensor, sc chan<- State, run *bool, wg *sync.WaitGroup) {
 	var s State
-	s.ID = sensor.ID
+	s.Alias = sensor.Alias
 	s.Changed = time.Now()
 
 	cpin := rpio.Pin(sensor.CoolGPIO)
@@ -114,6 +114,7 @@ func RunThermostat(sensor Sensor, sc chan<- State, run *bool, wg *sync.WaitGroup
 		}
 	}
 
+	log.Printf("%s Shutting down thermostat", sensor.Alias)
 	PinSwitch(cpin, false, sensor.CoolInvert)
 	PinSwitch(hpin, false, sensor.HeatInvert)
 	wg.Done()

web.go

@@ -10,11 +10,24 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+var states map[string]State
+
 // PingHandler responds to get requests with the message "pong".
 func PingHandler(c *gin.Context) {
 	c.String(http.StatusOK, "pong")
 }
 
+// StatusHandler responds to get requests with the current status of a sensor
+func StatusHandler(c *gin.Context) {
+	if c.Param("alias") == "/" {
+		c.JSON(http.StatusOK, states)
+	} else if val, ok := states[c.Param("alias")[1:]]; ok {
+		c.JSON(http.StatusOK, val)
+	} else {
+		c.JSON(http.StatusNotFound, "Not found")
+	}
+}
+
 // SetupRouter initializes the gin router.
 func SetupRouter() *gin.Engine {
 	r := gin.Default()
@@ -24,17 +37,20 @@ func SetupRouter() *gin.Engine {
 	// Ping
 	r.GET("/ping", PingHandler)
 
+	// Status
+	r.GET("/api/status/*alias", StatusHandler)
+
 	return r
 }
 
 // RunWeb launches a web server. sc is used to update the states from the Thermostats.
 func RunWeb(sc <-chan State, done <-chan bool, wg *sync.WaitGroup) {
 	// Update sensor states when a new state comes back from the thermostat.
-	states := make(map[string]State)
+	states = make(map[string]State)
 	go func() {
 		for {
 			s := <-sc
-			states[s.ID] = s
+			states[s.Alias] = s
 		}
 	}()