summaryrefslogtreecommitdiffstats
path: root/gateway
diff options
context:
space:
mode:
authorLiam Stanley <me@liamstanley.io>2018-06-09 06:47:40 -0400
committerWim <wim@42.be>2018-06-09 12:47:40 +0200
commit51327a405651442ac47c4ce75363442fa323b592 (patch)
tree4011309b5c748f7e5e717a5a7fc62a4026c6f421 /gateway
parent33bd60528be4eaf28ffd1065517ea41fde9ea62b (diff)
downloadmatterbridge-msglm-51327a405651442ac47c4ce75363442fa323b592.tar.gz
matterbridge-msglm-51327a405651442ac47c4ce75363442fa323b592.tar.bz2
matterbridge-msglm-51327a405651442ac47c4ce75363442fa323b592.zip
Reconnect on quit. (irc) See #431 (#445)
* potential fixes for #431 * go: fix formatting/gofmt/goreturns
Diffstat (limited to 'gateway')
-rw-r--r--gateway/gateway.go24
-rw-r--r--gateway/gateway_test.go3
-rw-r--r--gateway/router.go3
-rw-r--r--gateway/samechannel/samechannel_test.go1
4 files changed, 17 insertions, 14 deletions
diff --git a/gateway/gateway.go b/gateway/gateway.go
index b926912a..6529393f 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -10,18 +10,18 @@ import (
"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/api"
"github.com/42wim/matterbridge/bridge/config"
- "github.com/42wim/matterbridge/bridge/discord"
- "github.com/42wim/matterbridge/bridge/gitter"
- "github.com/42wim/matterbridge/bridge/irc"
- "github.com/42wim/matterbridge/bridge/matrix"
- "github.com/42wim/matterbridge/bridge/mattermost"
- "github.com/42wim/matterbridge/bridge/rocketchat"
- "github.com/42wim/matterbridge/bridge/slack"
- "github.com/42wim/matterbridge/bridge/sshchat"
- "github.com/42wim/matterbridge/bridge/steam"
- "github.com/42wim/matterbridge/bridge/telegram"
- "github.com/42wim/matterbridge/bridge/xmpp"
- "github.com/42wim/matterbridge/bridge/zulip"
+ bdiscord "github.com/42wim/matterbridge/bridge/discord"
+ bgitter "github.com/42wim/matterbridge/bridge/gitter"
+ birc "github.com/42wim/matterbridge/bridge/irc"
+ bmatrix "github.com/42wim/matterbridge/bridge/matrix"
+ bmattermost "github.com/42wim/matterbridge/bridge/mattermost"
+ brocketchat "github.com/42wim/matterbridge/bridge/rocketchat"
+ bslack "github.com/42wim/matterbridge/bridge/slack"
+ bsshchat "github.com/42wim/matterbridge/bridge/sshchat"
+ bsteam "github.com/42wim/matterbridge/bridge/steam"
+ btelegram "github.com/42wim/matterbridge/bridge/telegram"
+ bxmpp "github.com/42wim/matterbridge/bridge/xmpp"
+ bzulip "github.com/42wim/matterbridge/bridge/zulip"
"github.com/hashicorp/golang-lru"
log "github.com/sirupsen/logrus"
// "github.com/davecgh/go-spew/spew"
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
index 25242177..bf9461c7 100644
--- a/gateway/gateway_test.go
+++ b/gateway/gateway_test.go
@@ -2,9 +2,10 @@ package gateway
import (
"fmt"
+ "strconv"
+
"github.com/42wim/matterbridge/bridge/config"
"github.com/stretchr/testify/assert"
- "strconv"
"testing"
)
diff --git a/gateway/router.go b/gateway/router.go
index 264486c2..3a45de36 100644
--- a/gateway/router.go
+++ b/gateway/router.go
@@ -2,9 +2,10 @@ package gateway
import (
"fmt"
+
"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config"
- "github.com/42wim/matterbridge/gateway/samechannel"
+ samechannelgateway "github.com/42wim/matterbridge/gateway/samechannel"
// "github.com/davecgh/go-spew/spew"
"time"
)
diff --git a/gateway/samechannel/samechannel_test.go b/gateway/samechannel/samechannel_test.go
index 7e48ebc4..7c75444f 100644
--- a/gateway/samechannel/samechannel_test.go
+++ b/gateway/samechannel/samechannel_test.go
@@ -2,6 +2,7 @@ package samechannelgateway
import (
"fmt"
+
"github.com/42wim/matterbridge/bridge/config"
"github.com/BurntSushi/toml"
"github.com/stretchr/testify/assert"