Migrate to structured logging in session handling code.

klizhentas · Feb 20, 2018 · c8192e1 · c8192e1
1 parent 5254760
commit c8192e1
Show file tree

Hide file tree

Showing 4 changed files with 252 additions and 214 deletions.
diff --git a/constants.go b/constants.go
@@ -118,6 +118,9 @@ const (
 	// ComponentKeyGen is the public/private keypair generator.
 	ComponentKeyGen = "keygen"
 
+	// ComponentSession is an active session.
+	ComponentSession = "session"
+
 	// DebugEnvVar tells tests to use verbose debug output
 	DebugEnvVar = "DEBUG"
 

diff --git a/lib/srv/forward/sshserver.go b/lib/srv/forward/sshserver.go
@@ -186,7 +186,10 @@ func New(c ServerConfig) (*Server, error) {
 		sessionServer:   c.AuthClient,
 	}
 
-	s.sessionRegistry = srv.NewSessionRegistry(s)
+	s.sessionRegistry, err = srv.NewSessionRegistry(s)
+	if err != nil {
+		return nil, trace.Wrap(err)
+	}
 
 	// common auth handlers
 	s.authHandlers = &srv.AuthHandlers{

diff --git a/lib/srv/regular/sshserver.go b/lib/srv/regular/sshserver.go
@@ -353,7 +353,10 @@ func New(addr utils.NetAddr,
 		component = teleport.ComponentNode
 	}
 
-	s.reg = srv.NewSessionRegistry(s)
+	s.reg, err = srv.NewSessionRegistry(s)
+	if err != nil {
+		return nil, trace.Wrap(err)
+	}
 
 	// add in common auth handlers
 	s.authHandlers = &srv.AuthHandlers{