maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2984 from pulumi/jen20/replace-glog

Browse source 
Depend on `pulumi` fork of `glog`.
This commit is contained in:
James Nugent 2019-07-25 16:43:55 -05:00 committed by GitHub
parent 3fb8a59da9 7f6a6501ef
commit 54fde111a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -43,7 +43,7 @@ This repository does not actually create any real cloud resources as part of tes
The Pulumi tools have extensive logging built in. In fact, we encourage liberal logging in new code, and adding new logging when debugging problems. This helps to ensure future debugging endeavors benefit from your sleuthing.
All logging is done using Google's [Glog library](https://github.com/golang/glog). It is relatively bare-bones, and adds basic leveled logging, stack dumping, and other capabilities beyond what Go's built-in logging routines offer.
All logging is done using a fork of Google's [Glog library](https://github.com/pulumi/glog). It is relatively bare-bones, and adds basic leveled logging, stack dumping, and other capabilities beyond what Go's built-in logging routines offer.
The `pulumi` command line has two flags that control this logging and that can come in handy when debugging problems. The `--logtostderr` flag spews directly to stderr, rather than the default of logging to files in your temp directory. And the `--verbose=n` flag (`-v=n` for short) sets the logging level to `n`. Anything greater than 3 is reserved for debug-level logging, greater than 5 is going to be quite verbose, and anything beyond 7 is extremely noisy.

2
cmd/pulumi.go
View file

@ -30,8 +30,8 @@ import (
"github.com/blang/semver"
"github.com/djherbis/times"
"github.com/docker/docker/pkg/term"
"github.com/golang/glog"
"github.com/pkg/errors"
"github.com/pulumi/glog"
"github.com/spf13/cobra"
"github.com/pulumi/pulumi/pkg/backend/display"

2
cmd/util.go
View file

@ -27,10 +27,10 @@ import (
"strconv"
"strings"
"github.com/golang/glog"
multierror "github.com/hashicorp/go-multierror"
"github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
"github.com/pulumi/glog"
survey "gopkg.in/AlecAivazis/survey.v1"
surveycore "gopkg.in/AlecAivazis/survey.v1/core"
git "gopkg.in/src-d/go-git.v4"

4
go.mod
View file

@ -16,7 +16,6 @@ require (
github.com/fatih/color v1.7.0 // indirect
github.com/gofrs/flock v0.7.0
github.com/gogo/protobuf v1.2.0 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/protobuf v1.3.1
github.com/google/go-querystring v1.0.0
github.com/gorilla/context v1.1.1 // indirect
@ -35,6 +34,7 @@ require (
github.com/onsi/gomega v1.4.3 // indirect
github.com/opentracing/opentracing-go v1.0.2
github.com/pkg/errors v0.8.1
github.com/pulumi/glog v0.0.0-20160126235308-23def4e6c14b
github.com/reconquest/loreley v0.0.0-20160708080500-2ab6b7470a54
github.com/russross/blackfriday v1.5.2 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94
@ -63,5 +63,3 @@ require (
gopkg.in/src-d/go-git.v4 v4.8.1
gopkg.in/yaml.v2 v2.2.2
)
replace github.com/golang/glog => github.com/pulumi/glog v0.0.0-20180820174630-7eaa6ffb71e4

3
go.sum
View file

@ -116,6 +116,7 @@ github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@ -293,6 +294,8 @@ github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:
github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/pulumi/glog v0.0.0-20160126235308-23def4e6c14b h1:Nz3B+gzi82v2f+ctA7gdcMey6ONWfPM4/K4U2TbsGyA=
github.com/pulumi/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:6V/nMJd07pUX6IDP/oTGEQ0RwnBuBGM+kp8leKyKo50=
github.com/pulumi/glog v0.0.0-20180820174630-7eaa6ffb71e4 h1:/qvWZpmGSkjImeceqLKi6LpGuKi++sGUh++wm1yTP+4=
github.com/pulumi/glog v0.0.0-20180820174630-7eaa6ffb71e4/go.mod h1:6V/nMJd07pUX6IDP/oTGEQ0RwnBuBGM+kp8leKyKo50=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=

2
pkg/backend/display/json.go
View file

@ -19,7 +19,7 @@ import (
"fmt"
"time"
"github.com/golang/glog"
"github.com/pulumi/glog"
"github.com/pulumi/pulumi/pkg/apitype"
"github.com/pulumi/pulumi/pkg/diag"

2
pkg/backend/httpstate/state.go
View file

@ -20,7 +20,7 @@ import (
"sync"
"time"
"github.com/golang/glog"
"github.com/pulumi/glog"
"github.com/pulumi/pulumi/pkg/diag"
"github.com/pulumi/pulumi/pkg/util/contract"

2
pkg/util/logging/log.go
View file

@ -30,7 +30,7 @@ import (
"strconv"
"sync"
"github.com/golang/glog"
"github.com/pulumi/glog"
)
type Filter interface {

2
sdk/go/pulumi/context.go
View file

@ -18,10 +18,10 @@ import (
"sort"
"sync"
"github.com/golang/glog"
structpb "github.com/golang/protobuf/ptypes/struct"
"github.com/hashicorp/go-multierror"
"github.com/pkg/errors"
"github.com/pulumi/glog"
"golang.org/x/net/context"
"google.golang.org/grpc"

2
sdk/nodejs/cmd/pulumi-language-nodejs/main.go
View file

@ -41,9 +41,9 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/golang/glog"
pbempty "github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"
"github.com/pulumi/glog"
"github.com/pulumi/pulumi/pkg/resource/config"
"github.com/pulumi/pulumi/pkg/util/cmdutil"
"github.com/pulumi/pulumi/pkg/util/contract"