Adjust service command outputs to use cmd Print functions

This commit is contained in:
mlsmaycon 2021-06-22 01:07:12 +02:00
parent 8088c7a591
commit a87f828844
2 changed files with 30 additions and 14 deletions

View File

@ -2,7 +2,6 @@ package cmd
import ( import (
"github.com/kardianos/service" "github.com/kardianos/service"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -31,12 +30,15 @@ var (
s, err := newSVC(prg, newSVCConfig()) s, err := newSVC(prg, newSVCConfig())
if err != nil { if err != nil {
log.Fatal(err) cmd.PrintErrln(err)
return
} }
err = s.Run() err = s.Run()
if err != nil { if err != nil {
logger.Error(err) //nolint cmd.PrintErrln(err)
return
} }
cmd.Printf("Wiretrustee service is running")
}, },
} }
) )
@ -49,12 +51,15 @@ var (
s, err := newSVC(&program{}, newSVCConfig()) s, err := newSVC(&program{}, newSVCConfig())
if err != nil { if err != nil {
log.Fatal(err) cmd.PrintErrln(err)
return
} }
err = s.Start() err = s.Start()
if err != nil { if err != nil {
logger.Error(err) //nolint cmd.PrintErrln(err)
return
} }
cmd.Printf("Wiretrustee service has been started")
}, },
} }
) )
@ -67,12 +72,15 @@ var (
s, err := newSVC(&program{}, newSVCConfig()) s, err := newSVC(&program{}, newSVCConfig())
if err != nil { if err != nil {
log.Fatal(err) cmd.PrintErrln(err)
return
} }
err = s.Stop() err = s.Stop()
if err != nil { if err != nil {
logger.Error(err) //nolint cmd.PrintErrln(err)
return
} }
cmd.Printf("Wiretrustee service has been stopped")
}, },
} }
) )
@ -85,12 +93,15 @@ var (
s, err := newSVC(&program{}, newSVCConfig()) s, err := newSVC(&program{}, newSVCConfig())
if err != nil { if err != nil {
log.Fatal(err) cmd.PrintErrln(err)
return
} }
err = s.Restart() err = s.Restart()
if err != nil { if err != nil {
logger.Error(err) //nolint cmd.PrintErrln(err)
return
} }
cmd.Printf("Wiretrustee service has been restarted")
}, },
} }
) )

View File

@ -1,7 +1,6 @@
package cmd package cmd
import ( import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"runtime" "runtime"
) )
@ -30,13 +29,16 @@ var (
s, err := newSVC(&program{}, svcConfig) s, err := newSVC(&program{}, svcConfig)
if err != nil { if err != nil {
log.Fatal(err) cmd.PrintErrln(err)
return
} }
err = s.Install() err = s.Install()
if err != nil { if err != nil {
log.Error(err) cmd.PrintErrln(err)
return
} }
cmd.Printf("Wiretrustee service has been installed")
}, },
} }
) )
@ -49,13 +51,16 @@ var (
s, err := newSVC(&program{}, newSVCConfig()) s, err := newSVC(&program{}, newSVCConfig())
if err != nil { if err != nil {
log.Fatal(err) cmd.PrintErrln(err)
return
} }
err = s.Uninstall() err = s.Uninstall()
if err != nil { if err != nil {
log.Error(err) cmd.PrintErrln(err)
return
} }
cmd.Printf("Wiretrustee has been uninstalled")
}, },
} }
) )