Commit3564e68

committed

simplify showmotd

1 parentbe9fa5a commit3564e68Copy full SHA for 3564e68

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -452,15 +452,10 @@ func (s *Server) startPTYSession(logger slog.Logger, session ptySession, magicTy`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`if!isQuietLogin(s.fs,session.RawCommand()) {`
`455`		`-motdFile:=s.config.MOTDFile()`
`456`		`-ifmotdFile!="" {`
`457`		`-err:=showMOTD(s.fs,session,motdFile)`
`458`		`-iferr!=nil {`
`459`		`-logger.Error(ctx,"agent failed to show MOTD",slog.Error(err))`
`460`		`-s.metrics.sessionErrors.WithLabelValues(magicTypeLabel,"yes","motd").Add(1)`
`461`		`-}`
`462`		`-}else {`
`463`		`-logger.Warn(ctx,"metadata lookup failed, unable to show MOTD")`
	`455`	`+err:=showMOTD(s.fs,session,s.config.MOTDFile())`
	`456`	`+iferr!=nil {`
	`457`	`+logger.Error(ctx,"agent failed to show MOTD",slog.Error(err))`
	`458`	`+s.metrics.sessionErrors.WithLabelValues(magicTypeLabel,"yes","motd").Add(1)`
`464`	`459`	`}`
`465`	`460`	`}`
`466`	`461`

Comments

(0)