From bc1afde4b8fd526476f1d34c37d2cdab676979e5 Mon Sep 17 00:00:00 2001
From: Boshi Lian <farmer1992@gmail.com>
Date: Sat, 29 Dec 2018 03:48:56 -0800
Subject: [PATCH] better log for upstream

---
 sshpiperd/upstream/database/handler.go  |  5 ++++-
 sshpiperd/upstream/database/plugin.go   | 10 ++++++++--
 sshpiperd/upstream/workingdir/plugin.go |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/sshpiperd/upstream/database/handler.go b/sshpiperd/upstream/database/handler.go
index 413bba64..bf4dda5a 100644
--- a/sshpiperd/upstream/database/handler.go
+++ b/sshpiperd/upstream/database/handler.go
@@ -10,7 +10,8 @@ import (
 
 func (p *plugin) findUpstream(conn ssh.ConnMetadata) (net.Conn, *ssh.AuthPipe, error) {
 
-	d, err := lookupDownstreamWithFallback(p.db, conn.User())
+	user := conn.User()
+	d, err := lookupDownstreamWithFallback(p.db, user)
 
 	if err != nil {
 		return nil, nil, err
@@ -18,6 +19,8 @@ func (p *plugin) findUpstream(conn ssh.ConnMetadata) (net.Conn, *ssh.AuthPipe, e
 
 	addr := d.Upstream.Server.Address
 
+	logger.Printf("mapping user [%v] to [%v@%v]", user, d.Username, addr)
+
 	c, err := dial(addr)
 
 	if err != nil {
diff --git a/sshpiperd/upstream/database/plugin.go b/sshpiperd/upstream/database/plugin.go
index 186b73da..b1055165 100644
--- a/sshpiperd/upstream/database/plugin.go
+++ b/sshpiperd/upstream/database/plugin.go
@@ -34,7 +34,9 @@ func (p *plugin) Init(glogger *log.Logger) error {
 		return err
 	}
 
-	db.AutoMigrate(
+	logger.Printf("upstream provider: Database driver [%v] initializing", db.Dialect().GetName())
+
+	err = db.AutoMigrate(
 		new(keydata),
 		new(privateKey),
 		new(hostKey),
@@ -43,7 +45,11 @@ func (p *plugin) Init(glogger *log.Logger) error {
 		new(authorizedKey),
 		new(downstream),
 		new(config),
-	)
+	).Error
+
+	if err != nil {
+		logger.Printf("AutoMigrate error: %v", err)
+	}
 
 	p.db = db
 
diff --git a/sshpiperd/upstream/workingdir/plugin.go b/sshpiperd/upstream/workingdir/plugin.go
index bd996417..3c472981 100644
--- a/sshpiperd/upstream/workingdir/plugin.go
+++ b/sshpiperd/upstream/workingdir/plugin.go
@@ -27,7 +27,7 @@ func (p *plugin) Init(glogger *log.Logger) error {
 
 	logger = glogger
 
-	logger.Printf("upstream provider: workingdir %v init", config.WorkingDir)
+	logger.Printf("upstream provider: workingdir from path [%v] initializing", config.WorkingDir)
 
 	return nil
 }