diff options
| author | Runxi Yu <me@runxiyu.org> | 2025-04-05 18:37:55 +0800 |
|---|---|---|
| committer | Runxi Yu <me@runxiyu.org> | 2025-04-05 18:37:55 +0800 |
| commit | 4836dd8b0be10b461b93d711bb2cf78d186210d1 (patch) | |
| tree | 3c84ec801c234c9bc1dfe1062e3a32710ae3e254 /ssh_server.go | |
| parent | Separate code/README rendering and unsafe to their own packages (diff) | |
| download | forge-4836dd8b0be10b461b93d711bb2cf78d186210d1.tar.gz forge-4836dd8b0be10b461b93d711bb2cf78d186210d1.tar.zst forge-4836dd8b0be10b461b93d711bb2cf78d186210d1.zip | |
Use log/slog instead of clog
Diffstat (limited to '')
| -rw-r--r-- | ssh_server.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh_server.go b/ssh_server.go index 1408a2a..345d47f 100644 --- a/ssh_server.go +++ b/ssh_server.go @@ -5,6 +5,7 @@ package main import ( "fmt" + "log/slog" "net" "os" "strings" @@ -12,7 +13,6 @@ import ( gliderSSH "github.com/gliderlabs/ssh" "go.lindenii.runxiyu.org/forge/misc" "go.lindenii.runxiyu.org/lindenii-common/ansiec" - "go.lindenii.runxiyu.org/lindenii-common/clog" goSSH "golang.org/x/crypto/ssh" ) @@ -51,7 +51,7 @@ func serveSSH(listener net.Listener) error { clientPubkeyStr = strings.TrimSuffix(misc.BytesToString(goSSH.MarshalAuthorizedKey(clientPubkey)), "\n") } - clog.Info("Incoming SSH: " + session.RemoteAddr().String() + " " + clientPubkeyStr + " " + session.RawCommand()) + slog.Info("incoming ssh", "addr", session.RemoteAddr().String(), "key", clientPubkeyStr, "command", session.RawCommand()) fmt.Fprintln(session.Stderr(), ansiec.Blue+"Lindenii Forge "+VERSION+", source at "+strings.TrimSuffix(config.HTTP.Root, "/")+"/-/source/"+ansiec.Reset+"\r") cmd := session.Command() @@ -94,7 +94,8 @@ func serveSSH(listener net.Listener) error { server.AddHostKey(hostKey) if err = server.Serve(listener); err != nil { - clog.Fatal(1, "Serving SSH: "+err.Error()) + slog.Error("error serving SSH", "error", err.Error()) + os.Exit(1) } return nil |