summaryrefslogtreecommitdiffstats
path: root/gateway/samechannel
diff options
context:
space:
mode:
authorWim <wim@42.be>2019-02-23 22:51:27 +0100
committerGitHub <noreply@github.com>2019-02-23 22:51:27 +0100
commitbf21604d425b4feb1b95e4e94643e7a658eeea90 (patch)
tree376741188b9646ef66526b36e24d3577f07a678f /gateway/samechannel
parent1bb39eba8717f62336cc98c5bb7cfbef194f3626 (diff)
downloadmatterbridge-msglm-bf21604d425b4feb1b95e4e94643e7a658eeea90.tar.gz
matterbridge-msglm-bf21604d425b4feb1b95e4e94643e7a658eeea90.tar.bz2
matterbridge-msglm-bf21604d425b4feb1b95e4e94643e7a658eeea90.zip
Make all loggers derive from non-default instance (#728)
Diffstat (limited to 'gateway/samechannel')
-rw-r--r--gateway/samechannel/samechannel.go2
-rw-r--r--gateway/samechannel/samechannel_test.go8
2 files changed, 7 insertions, 3 deletions
diff --git a/gateway/samechannel/samechannel.go b/gateway/samechannel/samechannel.go
index 1d85ea7d..4b6016c6 100644
--- a/gateway/samechannel/samechannel.go
+++ b/gateway/samechannel/samechannel.go
@@ -1,4 +1,4 @@
-package samechannelgateway
+package samechannel
import (
"github.com/42wim/matterbridge/bridge/config"
diff --git a/gateway/samechannel/samechannel_test.go b/gateway/samechannel/samechannel_test.go
index bbfb0577..17d816a9 100644
--- a/gateway/samechannel/samechannel_test.go
+++ b/gateway/samechannel/samechannel_test.go
@@ -1,9 +1,11 @@
-package samechannelgateway
+package samechannel
import (
+ "io/ioutil"
"testing"
"github.com/42wim/matterbridge/bridge/config"
+ "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
)
@@ -66,7 +68,9 @@ var (
)
func TestGetConfig(t *testing.T) {
- cfg := config.NewConfigFromString([]byte(testConfig))
+ logger := logrus.New()
+ logger.SetOutput(ioutil.Discard)
+ cfg := config.NewConfigFromString(logger, []byte(testConfig))
sgw := New(cfg)
configs := sgw.GetConfig()
assert.Equal(t, []config.Gateway{expectedConfig}, configs)