Merge pull request #18 from depili/source.Connected

Fix tally `SourceState.Connected`, and use it for the GPIO status pins. This allows the `--gpio-green-pin`, `--gpio-red-pin` options to be used for status output independently.

Fixes #16, #17

Author: SpComb

gpio/gpio.go

@@ -131,8 +131,6 @@ func (gpio *GPIO) updateTally(state tally.State) {
 		if status, exists := state.Tally[id]; !exists {
 			// missing tally state for pin
 		} else {
-			statusGreen = true
-
 			if status.Status.High() {
 				log.Printf("GPIO:\ttally pin %v high: %v", pin, status)
 
@@ -143,6 +141,12 @@ func (gpio *GPIO) updateTally(state tally.State) {
 		pin.Set(pinState)
 	}
 
+	for _, source := range state.Sources {
+		if source.Connected {
+			statusGreen = true
+		}
+	}
+
 	if len(state.Errors) > 0 {
 		statusRed = true
 	}

tally/source.go

@@ -59,6 +59,7 @@ func (source Source) String() string {
 }
 
 func (source Source) run(updateChan chan Source) {
+	defer source.xmlClient.Close()
 	for {
 		if system, err := source.xmlClient.Read(); err == nil {
 			source.system = system

tally/state.go

@@ -128,7 +128,7 @@ func (state *State) setSourceError(source Source, err error) {
 		Discovery: source.discoveryPacket,
 		FirstSeen: source.created,
 		LastSeen:  source.updated,
-		Connected: (source.xmlClient != nil),
+		Connected: (!source.closed && source.err == nil),
 		Error:     err,
 	}