API tweaks

This commit is contained in:
Neil Alexander 2021-02-03 17:46:01 +00:00
parent f95a9c9d90
commit 8762421bc2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -105,13 +105,13 @@ func (m *DendriteMonolith) DisconnectPort(port int) error {
func (m *DendriteMonolith) Conduit(zone string) (*Conduit, error) { func (m *DendriteMonolith) Conduit(zone string) (*Conduit, error) {
l, r := net.Pipe() l, r := net.Pipe()
var p types.SwitchPortID conduit := &Conduit{conn: r, port: 0}
go func() { go func() {
loop: loop:
for i := 1; i <= 10; i++ { for i := 1; i <= 10; i++ {
logrus.Errorf("Attempting authenticated connect (attempt %d)", i) logrus.Errorf("Attempting authenticated connect (attempt %d)", i)
var err error var err error
p, err = m.PineconeRouter.AuthenticatedConnect(l, zone) conduit.port, err = m.PineconeRouter.AuthenticatedConnect(l, zone)
switch err { switch err {
case io.ErrClosedPipe: case io.ErrClosedPipe:
logrus.Errorf("Authenticated connect failed due to closed pipe (attempt %d)", i) logrus.Errorf("Authenticated connect failed due to closed pipe (attempt %d)", i)
@ -130,7 +130,7 @@ func (m *DendriteMonolith) Conduit(zone string) (*Conduit, error) {
_ = l.Close() _ = l.Close()
_ = r.Close() _ = r.Close()
}() }()
return &Conduit{conn: r, port: p}, nil return conduit, nil
} }
func (m *DendriteMonolith) RegisterUser(localpart, password string) (string, error) { func (m *DendriteMonolith) RegisterUser(localpart, password string) (string, error) {