refactor: updated cmd and pkg implementations
This commit is contained in:
parent
d88ab2c01f
commit
fbed466c3d
10 changed files with 287 additions and 196 deletions
31
cmd/root.go
31
cmd/root.go
|
|
@ -2,6 +2,7 @@ package cmd
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
logger "git.towk2.me/towk/makeshift/pkg/log"
|
||||
|
|
@ -78,6 +79,16 @@ func setenv(cmd *cobra.Command, varname string, envvar string) {
|
|||
}
|
||||
}
|
||||
|
||||
func setenvp(cmd *cobra.Command, varname string, envvar string) {
|
||||
if cmd.Flags().Changed(varname) {
|
||||
return
|
||||
}
|
||||
val := os.Getenv(envvar)
|
||||
if val != "" {
|
||||
cmd.PersistentFlags().Set(varname, val)
|
||||
}
|
||||
}
|
||||
|
||||
func initLogger() {
|
||||
// initialize the logger
|
||||
logfile, _ := rootCmd.PersistentFlags().GetString("log-file")
|
||||
|
|
@ -87,3 +98,23 @@ func initLogger() {
|
|||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func handleResponseError(res *http.Response, host, query string, err error) {
|
||||
if err != nil {
|
||||
log.Error().Err(err).
|
||||
Str("host", host).
|
||||
Str("query", query).
|
||||
Msg("failed to make request")
|
||||
os.Exit(1)
|
||||
}
|
||||
if res.StatusCode != http.StatusOK {
|
||||
log.Error().
|
||||
Any("status", map[string]any{
|
||||
"code": res.StatusCode,
|
||||
"message": res.Status,
|
||||
}).
|
||||
Str("host", host).
|
||||
Msg("response returned bad status")
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue