logger pkg
This commit is contained in:
@@ -7,7 +7,7 @@ import (
|
||||
"path"
|
||||
|
||||
"gitbase.de/apairon/mark2web/pkg/filter"
|
||||
"gitbase.de/apairon/mark2web/pkg/helper"
|
||||
"gitbase.de/apairon/mark2web/pkg/logger"
|
||||
"gitbase.de/apairon/mark2web/pkg/mark2web"
|
||||
)
|
||||
|
||||
@@ -25,7 +25,7 @@ func main() {
|
||||
outDir := flag.String("out", "html", "output directory")
|
||||
createOutDir := flag.Bool("create", false, "create output directory if not existing")
|
||||
//clearOutDir := flag.Bool("clear", false, "clear output directory before generating website")
|
||||
logLevel := flag.String("logLevel", "info", "log level: debug, info, warning, error")
|
||||
logLevel := flag.String("logLevel", "notice", "log level: debug, info, notice, warning, error")
|
||||
version := flag.Bool("version", false, "print version of this executable")
|
||||
|
||||
flag.Parse()
|
||||
@@ -37,60 +37,60 @@ func main() {
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
level := "info"
|
||||
level := "notice"
|
||||
if logLevel != nil {
|
||||
level = *logLevel
|
||||
}
|
||||
helper.ConfigureLogger(level)
|
||||
logger.SetLogLevel(level)
|
||||
|
||||
if inDir == nil || *inDir == "" {
|
||||
helper.Log.Panic("input directory not specified")
|
||||
logger.Log.Panic("input directory not specified")
|
||||
}
|
||||
iDir := path.Clean(*inDir)
|
||||
inDir = &iDir
|
||||
helper.Log.Infof("input directory: %s", *inDir)
|
||||
logger.Log.Infof("input directory: %s", *inDir)
|
||||
|
||||
if outDir == nil || *outDir == "" {
|
||||
helper.Log.Panic("output directory not specified")
|
||||
logger.Log.Panic("output directory not specified")
|
||||
}
|
||||
oDir := path.Clean(*outDir)
|
||||
outDir = &oDir
|
||||
helper.Log.Infof("output directory: %s", *outDir)
|
||||
logger.Log.Infof("output directory: %s", *outDir)
|
||||
|
||||
if createOutDir != nil && *createOutDir {
|
||||
if _, err := os.Stat(*outDir); os.IsNotExist(err) {
|
||||
helper.Log.Debugf("output directory '%s' does not exist", *outDir)
|
||||
helper.Log.Debugf("trying to create output directory: %s", *outDir)
|
||||
logger.Log.Debugf("output directory '%s' does not exist", *outDir)
|
||||
logger.Log.Debugf("trying to create output directory: %s", *outDir)
|
||||
err := os.MkdirAll(*outDir, 0755)
|
||||
if err != nil {
|
||||
helper.Log.Panic(err)
|
||||
logger.Log.Panic(err)
|
||||
}
|
||||
helper.Log.Noticef("created output directory: %s", *outDir)
|
||||
logger.Log.Noticef("created output directory: %s", *outDir)
|
||||
} else {
|
||||
helper.Log.Noticef("output directory '%s' already exists", *outDir)
|
||||
logger.Log.Noticef("output directory '%s' already exists", *outDir)
|
||||
}
|
||||
}
|
||||
|
||||
if fD, err := os.Stat(*outDir); os.IsNotExist(err) {
|
||||
helper.Log.Panicf("output directory '%s' does not exist, try -create parameter or create manually", *outDir)
|
||||
logger.Log.Panicf("output directory '%s' does not exist, try -create parameter or create manually", *outDir)
|
||||
} else {
|
||||
if fD == nil {
|
||||
helper.Log.Panicf("something went wrong, could not get file handle for output dir %s", *outDir)
|
||||
logger.Log.Panicf("something went wrong, could not get file handle for output dir %s", *outDir)
|
||||
} else if !fD.IsDir() {
|
||||
helper.Log.Panicf("output directory '%s' is not a directory", *outDir)
|
||||
logger.Log.Panicf("output directory '%s' is not a directory", *outDir)
|
||||
}
|
||||
}
|
||||
|
||||
helper.Log.Debug("reading global config...")
|
||||
logger.Log.Debug("reading global config...")
|
||||
configFilename := *inDir + "/config.yml"
|
||||
err := mark2web.Config.ReadFromFile(configFilename)
|
||||
if err != nil {
|
||||
helper.Log.Panicf("could not read file '%s': %s", configFilename, err)
|
||||
logger.Log.Panicf("could not read file '%s': %s", configFilename, err)
|
||||
}
|
||||
mark2web.Config.Directories.Input = *inDir
|
||||
mark2web.Config.Directories.Output = *outDir
|
||||
|
||||
helper.Log.Debugf("reading input directory %s", *inDir)
|
||||
logger.Log.Debugf("reading input directory %s", *inDir)
|
||||
|
||||
defaultTemplate := "base.html"
|
||||
defaultInputFile := "README.md"
|
||||
|
||||
Reference in New Issue
Block a user