Skip to content

Commit 2868a62

Browse files
committed
Update logrus to 1.0.3.
github.com/sirupsen/logrus has officially changed name to lower-case. refs: https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md#100
1 parent eccb035 commit 2868a62

File tree

358 files changed

+72778
-508
lines changed

Some content is hidden

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

358 files changed

+72778
-508
lines changed

Gopkg.lock

+15-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

22
[[constraint]]
3-
name = "github.com/Sirupsen/logrus"
4-
version = "0.11.5"
3+
name = "github.com/sirupsen/logrus"
4+
version = "1.0.3"
55

66
[[constraint]]
77
name = "github.com/cyberdelia/go-metrics-graphite"
88

99
[[constraint]]
1010
name = "github.com/evalphobia/logrus_sentry"
11-
version = "0.2.10"
11+
version = "0.4.1"
1212

1313
[[constraint]]
1414
name = "github.com/getsentry/raven-go"
@@ -27,3 +27,8 @@
2727
[[constraint]]
2828
name = "github.com/stretchr/testify"
2929
version = "1.1.4"
30+
31+
# Remove once https://github.com/golang/go/issues/22688 is fixed
32+
[[override]]
33+
name = "golang.org/x/crypto"
34+
revision = "ca1fcd4ab4c10bc58852a894bcf195fab2229efe"

apps/app.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"strings"
66

7-
log "github.com/Sirupsen/logrus"
7+
log "github.com/sirupsen/logrus"
88
)
99

1010
// Only Marathon apps with this label will be registered in Consul

config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"strings"
88
"time"
99

10-
log "github.com/Sirupsen/logrus"
1110
"github.com/allegro/marathon-consul/consul"
1211
"github.com/allegro/marathon-consul/marathon"
1312
"github.com/allegro/marathon-consul/metrics"
@@ -16,6 +15,7 @@ import (
1615
"github.com/allegro/marathon-consul/sync"
1716
"github.com/allegro/marathon-consul/web"
1817
flag "github.com/ogier/pflag"
18+
log "github.com/sirupsen/logrus"
1919
)
2020

2121
type Config struct {

consul/agent.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"sync/atomic"
66

7-
log "github.com/Sirupsen/logrus"
87
consulapi "github.com/hashicorp/consul/api"
8+
log "github.com/sirupsen/logrus"
99
)
1010

1111
type Agent struct {

consul/agents.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"net/http"
88
"sync"
99

10-
log "github.com/Sirupsen/logrus"
1110
"github.com/allegro/marathon-consul/metrics"
1211
"github.com/allegro/marathon-consul/utils"
12+
log "github.com/sirupsen/logrus"
1313
)
1414

1515
type Agents interface {

consul/consul.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"net/url"
77
"strings"
88

9-
log "github.com/Sirupsen/logrus"
109
"github.com/allegro/marathon-consul/apps"
1110
"github.com/allegro/marathon-consul/metrics"
1211
"github.com/allegro/marathon-consul/service"
1312
"github.com/allegro/marathon-consul/utils"
1413
consulapi "github.com/hashicorp/consul/api"
14+
log "github.com/sirupsen/logrus"
1515
)
1616

1717
type Consul struct {

events/event_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"fmt"
77
"time"
88

9-
log "github.com/Sirupsen/logrus"
109
"github.com/allegro/marathon-consul/apps"
1110
"github.com/allegro/marathon-consul/marathon"
1211
"github.com/allegro/marathon-consul/metrics"
1312
"github.com/allegro/marathon-consul/service"
13+
log "github.com/sirupsen/logrus"
1414
)
1515

1616
type Event struct {

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"net/http"
55

6-
log "github.com/Sirupsen/logrus"
76
"github.com/allegro/marathon-consul/config"
87
"github.com/allegro/marathon-consul/consul"
98
"github.com/allegro/marathon-consul/marathon"
@@ -12,6 +11,7 @@ import (
1211
"github.com/allegro/marathon-consul/sse"
1312
"github.com/allegro/marathon-consul/sync"
1413
"github.com/allegro/marathon-consul/web"
14+
log "github.com/sirupsen/logrus"
1515
)
1616

1717
var VERSION string

marathon/marathon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"strings"
1212
"time"
1313

14-
log "github.com/Sirupsen/logrus"
1514
"github.com/allegro/marathon-consul/apps"
1615
"github.com/allegro/marathon-consul/metrics"
16+
log "github.com/sirupsen/logrus"
1717
)
1818

1919
var hostname = os.Hostname

marathon/streamer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99
"time"
1010

11-
log "github.com/Sirupsen/logrus"
11+
log "github.com/sirupsen/logrus"
1212
)
1313

1414
type Streamer struct {

metrics/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"strings"
1313
"time"
1414

15-
log "github.com/Sirupsen/logrus"
1615
"github.com/cyberdelia/go-metrics-graphite"
1716
"github.com/rcrowley/go-metrics"
17+
log "github.com/sirupsen/logrus"
1818
)
1919

2020
var pfx string

sentry/init.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package sentry
22

33
import (
4-
log "github.com/Sirupsen/logrus"
54
"github.com/evalphobia/logrus_sentry"
65
"github.com/getsentry/raven-go"
6+
log "github.com/sirupsen/logrus"
77
)
88

99
func Init(config Config) error {

sentry/init_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package sentry
33
import (
44
"testing"
55

6-
log "github.com/Sirupsen/logrus"
76
"github.com/evalphobia/logrus_sentry"
7+
log "github.com/sirupsen/logrus"
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"
1010
)

sse/sse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"net/http"
66
"time"
77

8-
log "github.com/Sirupsen/logrus"
98
"github.com/allegro/marathon-consul/events"
109
"github.com/allegro/marathon-consul/marathon"
1110
"github.com/allegro/marathon-consul/service"
1211
"github.com/allegro/marathon-consul/web"
12+
log "github.com/sirupsen/logrus"
1313
)
1414

1515
type Stop func()

sse/sse_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"io"
66
"time"
77

8-
log "github.com/Sirupsen/logrus"
98
"github.com/allegro/marathon-consul/events"
109
"github.com/allegro/marathon-consul/marathon"
1110
"github.com/allegro/marathon-consul/metrics"
11+
log "github.com/sirupsen/logrus"
1212
)
1313

1414
// SSEHandler defines handler for marathon event stream, opening and closing

sync/sync.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"fmt"
55
"time"
66

7-
log "github.com/Sirupsen/logrus"
87
"github.com/allegro/marathon-consul/apps"
98
"github.com/allegro/marathon-consul/marathon"
109
"github.com/allegro/marathon-consul/metrics"
1110
"github.com/allegro/marathon-consul/service"
11+
log "github.com/sirupsen/logrus"
1212
)
1313

1414
type Sync struct {

vendor/github.com/Sirupsen/logrus/.travis.yml

-8
This file was deleted.

vendor/github.com/Sirupsen/logrus/examples/basic/basic.go

-59
This file was deleted.

vendor/github.com/Sirupsen/logrus/examples/hook/hook.go

-30
This file was deleted.

0 commit comments

Comments
 (0)