Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update logrus to 1.0.3. #281

Merged
merged 1 commit into from
Nov 15, 2017
Merged

Update logrus to 1.0.3. #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 16 additions & 11 deletions Gopkg.lock
View file
Open in desktop

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

11 changes: 8 additions & 3 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

[[constraint]]
name = "github.com/Sirupsen/logrus"
version = "0.11.5"
name = "github.com/sirupsen/logrus"
version = "1.0.3"

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

[[constraint]]
name = "github.com/evalphobia/logrus_sentry"
version = "0.2.10"
version = "0.4.1"

[[constraint]]
name = "github.com/getsentry/raven-go"
Expand All @@ -27,3 +27,8 @@
[[constraint]]
name = "github.com/stretchr/testify"
version = "1.1.4"

# Remove once https://github.com/golang/go/issues/22688 is fixed
[[override]]
name = "golang.org/x/sys"
revision = "665f6529cca930e27b831a0d1dafffbe1c172924"
2 changes: 1 addition & 1 deletion apps/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"strings"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

// Only Marathon apps with this label will be registered in Consul
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"strings"
"time"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/consul"
"github.com/allegro/marathon-consul/marathon"
"github.com/allegro/marathon-consul/metrics"
Expand All @@ -16,6 +15,7 @@ import (
"github.com/allegro/marathon-consul/sync"
"github.com/allegro/marathon-consul/web"
flag "github.com/ogier/pflag"
log "github.com/sirupsen/logrus"
)

type Config struct {
Expand Down
2 changes: 1 addition & 1 deletion consul/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"sync/atomic"

log "github.com/Sirupsen/logrus"
consulapi "github.com/hashicorp/consul/api"
log "github.com/sirupsen/logrus"
)

type Agent struct {
Expand Down
2 changes: 1 addition & 1 deletion consul/agents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"net/http"
"sync"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/metrics"
"github.com/allegro/marathon-consul/utils"
log "github.com/sirupsen/logrus"
)

type Agents interface {
Expand Down
2 changes: 1 addition & 1 deletion consul/consul.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"net/url"
"strings"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/apps"
"github.com/allegro/marathon-consul/metrics"
"github.com/allegro/marathon-consul/service"
"github.com/allegro/marathon-consul/utils"
consulapi "github.com/hashicorp/consul/api"
log "github.com/sirupsen/logrus"
)

type Consul struct {
Expand Down
2 changes: 1 addition & 1 deletion events/event_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"time"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/apps"
"github.com/allegro/marathon-consul/marathon"
"github.com/allegro/marathon-consul/metrics"
"github.com/allegro/marathon-consul/service"
log "github.com/sirupsen/logrus"
)

type Event struct {
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package main
import (
"net/http"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/config"
"github.com/allegro/marathon-consul/consul"
"github.com/allegro/marathon-consul/marathon"
Expand All @@ -12,6 +11,7 @@ import (
"github.com/allegro/marathon-consul/sse"
"github.com/allegro/marathon-consul/sync"
"github.com/allegro/marathon-consul/web"
log "github.com/sirupsen/logrus"
)

var VERSION string
Expand Down
2 changes: 1 addition & 1 deletion marathon/marathon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"time"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/apps"
"github.com/allegro/marathon-consul/metrics"
log "github.com/sirupsen/logrus"
)

var hostname = os.Hostname
Expand Down
2 changes: 1 addition & 1 deletion marathon/streamer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

type Streamer struct {
Expand Down
2 changes: 1 addition & 1 deletion metrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"strings"
"time"

log "github.com/Sirupsen/logrus"
"github.com/cyberdelia/go-metrics-graphite"
"github.com/rcrowley/go-metrics"
log "github.com/sirupsen/logrus"
)

var pfx string
Expand Down
2 changes: 1 addition & 1 deletion sentry/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package sentry

import (
log "github.com/Sirupsen/logrus"
"github.com/evalphobia/logrus_sentry"
"github.com/getsentry/raven-go"
log "github.com/sirupsen/logrus"
)

func Init(config Config) error {
Expand Down
2 changes: 1 addition & 1 deletion sentry/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package sentry
import (
"testing"

log "github.com/Sirupsen/logrus"
"github.com/evalphobia/logrus_sentry"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion sse/sse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"net/http"
"time"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/events"
"github.com/allegro/marathon-consul/marathon"
"github.com/allegro/marathon-consul/service"
"github.com/allegro/marathon-consul/web"
log "github.com/sirupsen/logrus"
)

type Stop func()
Expand Down
2 changes: 1 addition & 1 deletion sse/sse_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"io"
"time"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/events"
"github.com/allegro/marathon-consul/marathon"
"github.com/allegro/marathon-consul/metrics"
log "github.com/sirupsen/logrus"
)

// SSEHandler defines handler for marathon event stream, opening and closing
Expand Down
2 changes: 1 addition & 1 deletion sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"time"

log "github.com/Sirupsen/logrus"
"github.com/allegro/marathon-consul/apps"
"github.com/allegro/marathon-consul/marathon"
"github.com/allegro/marathon-consul/metrics"
"github.com/allegro/marathon-consul/service"
log "github.com/sirupsen/logrus"
)

type Sync struct {
Expand Down
8 changes: 0 additions & 8 deletions vendor/github.com/Sirupsen/logrus/.travis.yml
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions vendor/github.com/Sirupsen/logrus/examples/basic/basic.go
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions vendor/github.com/Sirupsen/logrus/examples/hook/hook.go
View file
Open in desktop

This file was deleted.

Loading