kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #199 from dagger/fix-log-flags

Browse Source 
fix --log-* flags
This commit is contained in:
Andrea Luzzardi 2021-03-18 16:02:24 -07:00 committed by GitHub
commit fee4431d48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/dagger/cmd/compute.go
View File

@ -3,9 +3,9 @@ package cmd
import ( import (
"fmt" "fmt"
"dagger.io/go/cmd/dagger/logger"
"dagger.io/go/dagger" "dagger.io/go/dagger"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@ -27,8 +27,8 @@ var computeCmd = &cobra.Command{
} }
}, },
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
ctx := cmd.Context() lg := logger.New()
lg := log.Ctx(ctx) ctx := lg.WithContext(cmd.Context())
env, err := dagger.NewEnv() env, err := dagger.NewEnv()
if err != nil { if err != nil {

5
cmd/dagger/cmd/root.go
View File

@ -44,9 +44,10 @@ func init() {
func Execute() { func Execute() {
var ( var (
ctx = appcontext.Context()
// `--log-*` flags have not been parsed yet at this point so we get a
// default logger. Therefore, we can't store the logger into the context.
lg = logger.New() lg = logger.New()
ctx = lg.WithContext(appcontext.Context())
closer = logger.InitTracing() closer = logger.InitTracing()
span opentracing.Span span opentracing.Span
) )