heartbeat handling works now

1 files changed, 6 insertions, 9 deletions

diff --git a/src/rhctl/conf.go b/src/rhctl/conf.go
index 7a1aea0..0203471 100644
--- a/src/rhctl/conf.go
+++ b/src/rhctl/conf.go
@@ -37,10 +37,12 @@ type Config struct {
 	}
 
 	Servers map[string]struct {
-		ControlDevice     string   `toml:"ctrl_dev"`
-		ControlBaudrate   Baudrate `toml:"ctrl_baud"`
-		HeartbeatDevice   string   `toml:"heartbeat_dev"`
-		HeartbeatBaudrate Baudrate `toml:"heartbeat_baud"`
+		ControlDevice      string   `toml:"ctrl_dev"`
+		ControlBaudrate    Baudrate `toml:"ctrl_baud"`
+		HeartbeatDevice    string   `toml:"heartbeat_dev"`
+		HeartbeatBaudrate  Baudrate `toml:"heartbeat_baud"`
+		HeartbeatTimeout   Duration `toml:"heartbeat_timeout"`
+		HeartbeatThreshold uint     `toml:"heartbeat_threshold"`
 	}
 
 	Clients struct {
@@ -73,10 +75,5 @@ func ReadConfig(configfile string) (conf *Config, err error) {
 	if err = decoder.Decode(conf); err != nil {
 		return
 	}
-
-	if conf.Audioswitch.Timeout.Duration <= time.Duration(0) {
-		conf.Audioswitch.Timeout.Duration = time.Second
-	}
-
 	return
 }