diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2017-11-16 22:18:29 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2017-11-16 22:18:29 +0100 |
| commit | e095541652336559edb76854950f474f8aa86999 (patch) | |
| tree | c5ec2c0c832ff5b28f6a4a340c65ec9945f05358 /src/daq | |
| parent | server shutdown is a little better now (still needs some thoughts though) (diff) | |
| parent | pipe client connections can now be killed on shutdown (diff) | |
Merge branch 'clean-shutdown'
Diffstat (limited to 'src/daq')
| -rw-r--r-- | src/daq/s5proxy/src/s5proxy/proxy.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/daq/s5proxy/src/s5proxy/proxy.go b/src/daq/s5proxy/src/s5proxy/proxy.go index 3bb0afb..f994982 100644 --- a/src/daq/s5proxy/src/s5proxy/proxy.go +++ b/src/daq/s5proxy/src/s5proxy/proxy.go @@ -212,7 +212,7 @@ func (p *Proxy) Run() error { httpsL := m.Match(cmux.Any()) go p.RunHTTPS(httpsL) - if err := m.Serve(); !strings.Contains(err.Error(), "use of closed network connection") { + if err := m.Serve(); !strings.Contains(err.Error(), "use of closed network connection") { // TODO: is this really the best way to do this? return err } return nil |