commit 0d57bc4973207e40eff21464fa237af2791ffa07
Author: Wim <wim@42.be>
Date: Mon Oct 03 09:22:59 2016 +0000
Bail out on samechannel gateway when a bridge fails to start
diff --git a/gateway/gateway.go b/gateway/gateway.go
index 2180f93..fefbaeb 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -387 +387 @@ func New(cfg *config.Config, gateway *config.Gateway) error {
for _, br := range gw.Bridges {
err := br.Connect()
if err != nil {
- log.Fatalf("Bridge %s failed to start. Exiting", br.FullOrigin())
+ log.Fatalf("Bridge %s failed to start: %v", br.FullOrigin(), err)
}
for _, channel := range append(gw.ChannelsOut[br.FullOrigin()], gw.ChannelsIn[br.FullOrigin()]...) {
if exists[br.FullOrigin()+channel] {
diff --git a/gateway/samechannel/samechannel.go b/gateway/samechannel/samechannel.go
index 1ed4375..c7b3d62 100644
--- a/gateway/samechannel/samechannel.go
+++ b/gateway/samechannel/samechannel.go
@@ -297 +2910 @@ func New(cfg *config.Config, gateway *config.SameChannelGateway) error {
gw.Bridges = append(gw.Bridges, bridge.New(cfg, &br, c))
}
for _, br := range gw.Bridges {
- br.Connect()
+ err := br.Connect()
+ if err != nil {
+ log.Fatalf("Bridge %s failed to start: %v", br.FullOrigin(), err)
+ }
for _, channel := range gw.Channels {
log.Infof("%s: joining %s", br.FullOrigin(), channel)
br.JoinChannel(channel)
