simplify showmotd

mafredri · mafredri · commit 3564e685b49a · 2024-02-19T14:00:11.000+02:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -452,15 +452,10 @@ func (s *Server) startPTYSession(logger slog.Logger, session ptySession, magicTy
 	}
 
 	if !isQuietLogin(s.fs, session.RawCommand()) {
-		motdFile := s.config.MOTDFile()
-		if motdFile != "" {
-			err := showMOTD(s.fs, session, motdFile)
-			if err != nil {
-				logger.Error(ctx, "agent failed to show MOTD", slog.Error(err))
-				s.metrics.sessionErrors.WithLabelValues(magicTypeLabel, "yes", "motd").Add(1)
-			}
-		} else {
-			logger.Warn(ctx, "metadata lookup failed, unable to show MOTD")
+		err := showMOTD(s.fs, session, s.config.MOTDFile())
+		if err != nil {
+			logger.Error(ctx, "agent failed to show MOTD", slog.Error(err))
+			s.metrics.sessionErrors.WithLabelValues(magicTypeLabel, "yes", "motd").Add(1)
 		}
 	}
 

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`		`- if motdFile != "" {`
`457`		`- err := showMOTD(s.fs, session, motdFile)`
`458`		`- if err != 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`	`+ if err != 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`