commit b7a806337e1279f6301fc3dddd9425e2718e634f
Author: Wim <wim@42.be>
Date: Mon Jul 11 23:30:42 2016 +0000
Remove Port from IRC config. Specify it with server
diff --git a/README.md b/README.md
index 695be1f..50bd9c1 100644
--- a/README.md
+++ b/README.md
@@ -568 +567 @@ Look at matterbridge.conf.sample for an example
```
[IRC]
-server="irc.freenode.net"
-port=6667
+server="irc.freenode.net:6667"
#default no TLS connection to irc server
UseTLS=false
#do not check the certificate if we use TLS (allows for selfsigned certificates)
diff --git a/bridge/bridge.go b/bridge/bridge.go
index 8e2b139..b6445be 100644
--- a/bridge/bridge.go
+++ b/bridge/bridge.go
@@ -1147 +11410 @@ func (b *Bridge) createIRC(name string) *irc.Connection {
i.Password = b.Config.IRC.Password
}
i.AddCallback(ircm.RPL_WELCOME, b.handleNewConnection)
- i.Connect(b.Config.IRC.Server + ":" + strconv.Itoa(b.Config.IRC.Port))
+ err := i.Connect(b.Config.IRC.Server)
+ if err != nil {
+ flog.irc.Fatal(err)
+ }
return i
}
diff --git a/bridge/config.go b/bridge/config.go
index 37d3e95..2bec510 100644
--- a/bridge/config.go
+++ b/bridge/config.go
@@ -117 +116 @@ type Config struct {
UseTLS bool
SkipTLSVerify bool
Server string
- Port int
Nick string
Password string
Channel string
@@ -227 +216 @@ type Config struct {
}
Mattermost struct {
URL string
- Port int
ShowJoinPart bool
Token string
IconURL string
