From 0581515de05f0eea1d890a542a77d46fcda295d4 Mon Sep 17 00:00:00 2001 From: rmanach Date: Fri, 2 May 2025 11:19:36 +0200 Subject: [PATCH] fix log + fix nginx undeployment command --- deployers/nginx.go | 2 +- main.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/deployers/nginx.go b/deployers/nginx.go index f761cf1..ab46427 100644 --- a/deployers/nginx.go +++ b/deployers/nginx.go @@ -202,7 +202,7 @@ func (nd *NginxDeployer) Destroy() (err error) { _, err = nd.conn.Execute( fmt.Sprintf( - "unlink /etc/nginx/sites-enabled/%s", + "rm -f /etc/nginx/sites-enabled/%s", nginxConf, ), ) diff --git a/main.go b/main.go index 7196c5a..e039aab 100644 --- a/main.go +++ b/main.go @@ -210,10 +210,12 @@ func WithDestroy() InitOption { func initLogger(debug bool) { zerolog.TimeFieldFormat = zerolog.TimeFormatUnix zerolog.SetGlobalLevel(zerolog.InfoLevel) + ctx := log.With() if debug { zerolog.SetGlobalLevel(zerolog.DebugLevel) + ctx = ctx.Caller() } - log.Logger = log.With().Caller().Logger().Output(zerolog.ConsoleWriter{Out: os.Stderr}) + log.Logger = ctx.Logger().Output(zerolog.ConsoleWriter{Out: os.Stderr}) } // loadHMMap loads your instance configuration map from `$HOME/.homeserver` dir. @@ -510,5 +512,9 @@ func main() { //nolint: funlen // TODO: to reduce Msg("unable to deploy project, see logs for details") } - log.Info().Str("name", project.Name).Msg("project deployed successfully") + msg := "project deployed successfully" + if *destroy { + msg = "project undeployed successfully" + } + log.Info().Str("name", project.Name).Msg(msg) }