From b0bf012bbc243bbf79ff26aef7b48f667f0c9a52 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 22 Jul 2020 15:44:19 +0200 Subject: [PATCH] Change unix:// to irc+unix:// When Unix socket support will be added for listeners, unix:// will be ambiguous. It won't be clear whether to setup an IRC server, or some other kind of server (e.g. identd). unix:// is still recognized to avoid breaking existing DBs. --- doc/soju.1.scd | 2 +- upstream.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/soju.1.scd b/doc/soju.1.scd index dfd8aaa..5cfbaef 100644 --- a/doc/soju.1.scd +++ b/doc/soju.1.scd @@ -128,7 +128,7 @@ abbreviated form, for instance *network* can be abbreviated as *net* or just - _[ircs://][:port]_ connects with TLS over TCP - _irc+insecure://[:port]_ connects with plain-text TCP - - _unix:///_ connects to a Unix socket + - _irc+unix:///_ connects to a Unix socket Other options are: diff --git a/upstream.go b/upstream.go index 9a31ad4..b1b8330 100644 --- a/upstream.go +++ b/upstream.go @@ -142,7 +142,7 @@ func connectToUpstream(network *network) (*upstreamConn, error) { if err != nil { return nil, fmt.Errorf("failed to dial %q: %v", addr, err) } - case "unix": + case "irc+unix", "unix": logger.Printf("connecting to Unix socket at path %q", u.Path) netConn, err = dialer.Dial("unix", u.Path) if err != nil {