self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 02:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ev/i

Browse source
This commit is contained in:
Ev Kontsevoy 2017-06-09 21:34:13 -07:00
parent 91bd5d6cfa 752ee0f3d4
commit c0d7ecb6a5
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/auth/tun.go
View file

@ -992,7 +992,7 @@ func (c *TunClient) getClient() (client *ssh.Client, err error) {
if trace.IsAccessDenied(err) {
return nil, trace.Wrap(err)
}
log.Debugf("%v.getClient() throttle auth server %v: %v", c, authServer, err)
log.Errorf("%v.getClient() error while connecting to auth server %v: %v: throttling", c, authServer, err)
c.throttleAuthServer(authServer.String())
}
return nil, trace.ConnectionProblem(nil, "all auth servers are offline")

11
lib/session/session.go
View file

@ -271,15 +271,19 @@ func (s *server) GetSessions(namespace string) ([]Session, error) {
keys, err := s.bk.GetKeys(bucket)
if err != nil {
log.Error(err)
return nil, err
return nil, trace.Wrap(err)
}
for i, sid := range keys {
if i > MaxSessionSliceLength {
break
}
se, err := s.GetSession(namespace, ID(sid))
if trace.IsNotFound(err) {
continue
if err != nil {
if trace.IsNotFound(err) {
continue
}
log.Errorf("Unable to retrieve session: %v", err)
return nil, trace.Wrap(err)
}
out = append(out, *se)
}
@ -317,6 +321,7 @@ func (s *server) GetSession(namespace string, id ID) (*Session, error) {
if trace.IsNotFound(err) {
return nil, trace.NotFound("session(%v, %v) is not found", namespace, id)
}
return nil, trace.Wrap(err)
}
return sess, nil
}

2
lib/srv/sess.go
View file

@ -683,7 +683,7 @@ func (s *session) pollAndSync() {
errCount := 0
sync := func() error {
sess, err := sessionServer.GetSession(ns, s.id)
if sess == nil {
if err != nil || sess == nil {
return trace.Wrap(err)
}
var active = true