Skip to content

Commit

Permalink
Merge pull request #25 from deads2k/better-log
Browse files Browse the repository at this point in the history
better log message for resource creation
  • Loading branch information
openshift-merge-robot committed Apr 22, 2019
2 parents 9cc6349 + 80a8b5c commit c040eb0
Show file tree
Hide file tree
Showing 1,014 changed files with 61,733 additions and 335,458 deletions.
8 changes: 4 additions & 4 deletions cmd/cluster-bootstrap/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"log"
"time"

"github.com/golang/glog"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog"
)

type GlogWriter struct{}
Expand All @@ -16,17 +16,17 @@ func init() {
}

func (writer GlogWriter) Write(data []byte) (n int, err error) {
glog.Info(string(data))
klog.Info(string(data))
return len(data), nil
}

func InitLogs() {
log.SetOutput(GlogWriter{})
log.SetFlags(log.LUTC | log.Ldate | log.Ltime)
flushFreq := 5 * time.Second
go wait.Until(glog.Flush, flushFreq, wait.NeverStop)
go wait.Until(klog.Flush, flushFreq, wait.NeverStop)
}

func FlushLogs() {
glog.Flush()
klog.Flush()
}
28 changes: 16 additions & 12 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package: github.com/openshift/cluster-bootstrap
import:
- package: k8s.io/apimachinery
version: kubernetes-1.12.5
version: kubernetes-1.13.4
- package: k8s.io/api
version: kubernetes-1.12.5
version: kubernetes-1.13.4
- package: k8s.io/client-go
version: kubernetes-1.12.5
version: kubernetes-1.13.4
- package: github.com/openshift/library-go
version: master
- package: github.com/json-iterator/go
version: f2b4162afba35581b6d4a50d3b8f34e33c144682
version: f2b4162afba35581b6d4a50d3b8f34e33c144682
4 changes: 2 additions & 2 deletions pkg/start/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"strings"
"time"

"github.com/golang/glog"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/klog"
)

func waitUntilPodsRunning(ctx context.Context, c kubernetes.Interface, pods map[string][]string) error {
Expand Down Expand Up @@ -69,7 +69,7 @@ func (s *statusController) Run() {
func (s *statusController) AllRunningAndReady() (bool, error) {
ps, err := s.podStatus()
if err != nil {
glog.Infof("Error retriving pod statuses: %v", err)
klog.Infof("Error retriving pod statuses: %v", err)
return false, nil
}

Expand Down
5 changes: 3 additions & 2 deletions vendor/github.com/ghodss/yaml/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions vendor/github.com/ghodss/yaml/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion vendor/github.com/ghodss/yaml/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 40 additions & 12 deletions vendor/github.com/ghodss/yaml/yaml.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/ghodss/yaml/yaml_go110.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c040eb0

Please sign in to comment.