-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
152 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,19 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "flag" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "time" | ||
|
|
||
| "github.com/codecrafters-io/cli/internal/commands" | ||
| "github.com/codecrafters-io/cli/internal/utils" | ||
| "github.com/getsentry/sentry-go" | ||
| "github.com/rs/zerolog" | ||
| "github.com/rs/zerolog/log" | ||
| ) | ||
|
|
||
| var defaultSentryDSN = "https://[email protected]/4504174762065920" | ||
|
|
@@ -47,6 +51,7 @@ COMMANDS | |
|
|
||
| err := run() | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "codecrafters: %v\n", err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
|
|
@@ -67,23 +72,72 @@ func run() error { | |
| defer sentry.Flush(time.Second) | ||
| } | ||
|
|
||
| ctx := context.Background() | ||
|
|
||
| logger := newLogger() | ||
|
|
||
| var err error | ||
| cmd := flag.Arg(0) | ||
|
|
||
| logger.Debug().Str("command", cmd).Msg("command") | ||
|
|
||
| ctx = logger.WithContext(ctx) | ||
|
|
||
| switch cmd { | ||
| case "test": | ||
| return commands.TestCommand() | ||
| case "": // no argument | ||
| err = commands.TestCommand(ctx) | ||
| case "help", | ||
| "": // no argument | ||
| flag.Usage() | ||
| default: | ||
| fmt.Fprintf(os.Stderr, "Unknown command: \"%s\". Did you mean to run \"codecrafters test\"?\n", cmd) | ||
| fmt.Fprintf(os.Stderr, "Error: Run codecrafters help for a list of available commands.\n") | ||
| log.Error().Str("command", cmd).Msgf("Unknown command. Did you mean to run \"codecrafters test\"?") | ||
| log.Info().Msg("Run codecrafters help for a list of available commands.") | ||
|
|
||
| return errors.New("bad usage") | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("%v: %w", cmd, err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func newLogger() zerolog.Logger { | ||
| zerolog.TimeFieldFormat = time.RFC3339Nano | ||
|
|
||
| var logWriter io.Writer | ||
|
|
||
| switch logFmt := os.Getenv("CODECRAFTERS_LOG_FORMAT"); logFmt { | ||
| default: | ||
| fallthrough | ||
| case "pretty": | ||
| logWriter = zerolog.NewConsoleWriter(func(w *zerolog.ConsoleWriter) { | ||
| w.TimeFormat = "15:04:05.000" | ||
|
|
||
| w.FormatMessage = func(x interface{}) string { | ||
| return fmt.Sprintf("%-20s", x) | ||
| } | ||
| }) | ||
| case "json": | ||
| logWriter = os.Stderr | ||
| } | ||
|
|
||
| logger := zerolog.New(logWriter).With().Timestamp().Logger() | ||
| logger = logger.Level(zerolog.InfoLevel) | ||
|
|
||
| if q := os.Getenv("CODECRAFTERS_LOG_LEVEL"); q != "" { | ||
| lvl, err := zerolog.ParseLevel(q) | ||
| if err == nil { | ||
| logger = logger.Level(lvl) | ||
| } else { | ||
| logger.Warn().Err(err).Msg("parse log level") | ||
| } | ||
| } | ||
|
|
||
| return logger | ||
| } | ||
|
|
||
| func addRemoteURL(ev *sentry.Event, hint *sentry.EventHint) *sentry.Event { | ||
| repoDir, err := commands.GetRepositoryDir() | ||
| if err != nil { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.