Skip to content

Commit 260eeb7

Browse files
author
OpenShift Bot
authored
Merge pull request #10777 from smarterclayton/rebase
Merged by openshift-bot
2 parents d451518 + 65162e4 commit 260eeb7

File tree

7,096 files changed

+905310
-218747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,096 files changed

+905310
-218747
lines changed

‎Godeps/Godeps.json

Lines changed: 2645 additions & 1692 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/swagger-spec/api-v1.json

Lines changed: 510 additions & 299 deletions
Large diffs are not rendered by default.

‎api/swagger-spec/oapi-v1.json

Lines changed: 381 additions & 281 deletions
Large diffs are not rendered by default.

‎cmd/dockerregistry/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import (
99
"runtime"
1010

1111
log "github.com/Sirupsen/logrus"
12+
"k8s.io/kubernetes/pkg/util/logs"
13+
1214
"github.com/openshift/origin/pkg/cmd/dockerregistry"
1315
cmdutil "github.com/openshift/origin/pkg/cmd/util"
1416
"github.com/openshift/origin/pkg/cmd/util/serviceability"
@@ -20,6 +22,8 @@ import (
2022
)
2123

2224
func main() {
25+
logs.InitLogs()
26+
defer logs.FlushLogs()
2327
defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
2428
defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
2529
startProfiler()

‎cmd/gitserver/gitserver.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"path/filepath"
66
"runtime"
77

8+
"k8s.io/kubernetes/pkg/util/logs"
9+
810
"github.com/openshift/origin/pkg/cmd/infra/gitserver"
911
"github.com/openshift/origin/pkg/cmd/util/serviceability"
1012

@@ -15,6 +17,8 @@ import (
1517
)
1618

1719
func main() {
20+
logs.InitLogs()
21+
defer logs.FlushLogs()
1822
defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
1923
defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
2024

‎cmd/oc/oc.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"path/filepath"
66
"runtime"
77

8+
"k8s.io/kubernetes/pkg/util/logs"
9+
810
"github.com/openshift/origin/pkg/cmd/cli"
911
"github.com/openshift/origin/pkg/cmd/util/serviceability"
1012

@@ -17,6 +19,8 @@ import (
1719
)
1820

1921
func main() {
22+
logs.InitLogs()
23+
defer logs.FlushLogs()
2024
defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
2125
defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
2226

‎cmd/openshift/openshift.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"path/filepath"
66
"runtime"
77

8-
"github.com/golang/glog"
8+
"k8s.io/kubernetes/pkg/util/logs"
99

1010
"github.com/openshift/origin/pkg/cmd/openshift"
1111
"github.com/openshift/origin/pkg/cmd/util/serviceability"
@@ -19,11 +19,11 @@ import (
1919
)
2020

2121
func main() {
22+
logs.InitLogs()
23+
defer logs.FlushLogs()
2224
defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
2325
defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
2426

25-
glog.CopyStandardLogTo("INFO")
26-
2727
if len(os.Getenv("GOMAXPROCS")) == 0 {
2828
runtime.GOMAXPROCS(runtime.NumCPU())
2929
}

0 commit comments

Comments
 (0)