luzifer/envrun
1
0
Fork 0
mirror of https://github.com/Luzifer/envrun.git synced 2024-12-20 18:31:17 +00:00
Code Issues Releases Wiki Activity

Rework logging

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2018-06-01 17:34:33 +02:00
parent 97ec1824e9
commit 91d30bafa1
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
1 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
main.go
View file

@ -1,33 +1,49 @@
package main package main
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
openssl "github.com/Luzifer/go-openssl" openssl "github.com/Luzifer/go-openssl"
"github.com/Luzifer/rconfig" "github.com/Luzifer/rconfig"
log "github.com/sirupsen/logrus"
) )
var ( var (
version = "dev" cfg = struct {
cfg = struct { EnvFile string `flag:"env-file" default:".env" description:"Location of the environment file"`
EnvFile string `flag:"env-file" default:".env" description:"Location of the environment file"` Silent bool `flag:"q" default:"false" description:"Suppress informational messages from envrun (DEPRECATED, use --log-level=warn)"`
Silent bool `flag:"q" default:"false" description:"Suppress informational messages from envrun"` CleanEnv bool `flag:"clean" default:"false" description:"Do not pass current environment to child process"`
CleanEnv bool `flag:"clean" default:"false" description:"Do not pass current environment to child process"` LogLevel string `flag:"log-level" default:"info" description:"Log level (debug, info, warn, error, fatal)"`
Password string `flag:"password,p" default:"" env:"PASSWORD" description:"Password to decrypt environment file"` Password string `flag:"password,p" default:"" env:"PASSWORD" description:"Password to decrypt environment file"`
VersionAndExit bool `flag:"version" default:"false" description:"Prints current version and exits"`
}{} }{}
version = "dev"
) )
func init() { func init() {
rconfig.Parse(&cfg) if err := rconfig.ParseAndValidate(&cfg); err != nil {
} log.Fatalf("Unable to parse commandline options: %s", err)
}
func infoLog(message string, args ...interface{}) { if cfg.VersionAndExit {
if !cfg.Silent { fmt.Printf("envrun %s\n", version)
log.Printf(message, args...) os.Exit(0)
}
if cfg.Silent && cfg.LogLevel == "info" {
// Migration of deprecated flag
cfg.LogLevel = "warn"
}
if l, err := log.ParseLevel(cfg.LogLevel); err != nil {
log.WithError(err).Fatal("Unable to parse log level")
} else {
log.SetLevel(l)
} }
} }
@ -55,12 +71,12 @@ func envMapToList(envMap map[string]string) []string {
func main() { func main() {
body, err := ioutil.ReadFile(cfg.EnvFile) body, err := ioutil.ReadFile(cfg.EnvFile)
if err != nil { if err != nil {
log.Fatalf("Could not read env-file: %s", err) log.WithError(err).Fatal("Could not read env-file")
} }
if cfg.Password != "" { if cfg.Password != "" {
if body, err = openssl.New().DecryptString(cfg.Password, string(body)); err != nil { if body, err = openssl.New().DecryptString(cfg.Password, string(body)); err != nil {
log.Fatalf("Could not decrypt env-file: %s", err) log.WithError(err).Fatal("Could not decrypt env-file")
} }
} }
@ -86,13 +102,13 @@ func main() {
switch err.(type) { switch err.(type) {
case nil: case nil:
infoLog("Process exitted with code 0") log.Info("Process exitted with code 0")
os.Exit(0) os.Exit(0)
case *exec.ExitError: case *exec.ExitError:
infoLog("Unclean exit with exit-code != 0") log.Error("Unclean exit with exit-code != 0")
os.Exit(1) os.Exit(1)
default: default:
log.Printf("An unknown error ocurred: %s", err) log.WithError(err).Error("An unknown error ocurred")
os.Exit(2) os.Exit(2)
} }
} }