Skip to content
This repository was archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
Switched from github.com/Sirupsen/logrus to github.com/sirupsen/logrus (
Browse files Browse the repository at this point in the history
#394)

Switched from github.com/Sirupsen/logrus to github.com/sirupsen/logrus

* updated GOA to 1.3.0

Related fabric8-services/fabric8-wit#1395
  • Loading branch information
kwk authored and aslakknutsen committed Oct 13, 2017
1 parent 8f7e4f6 commit 1dc51b5
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion configuration/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
yaml "gopkg.in/yaml.v2"

"encoding/base64"
Expand Down
4 changes: 2 additions & 2 deletions controller/tenant.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (c *TenantController) Setup(ctx *app.SetupTenantContext) error {
}
}()

ctx.ResponseData.Header().Set("Location", rest.AbsoluteURL(ctx.RequestData, app.TenantHref()))
ctx.ResponseData.Header().Set("Location", rest.AbsoluteURL(ctx.RequestData.Request, app.TenantHref()))
return ctx.Accepted()
}

Expand Down Expand Up @@ -165,7 +165,7 @@ func (c *TenantController) Update(ctx *app.UpdateTenantContext) error {
}
}()

ctx.ResponseData.Header().Set("Location", rest.AbsoluteURL(ctx.RequestData, app.TenantHref()))
ctx.ResponseData.Header().Set("Location", rest.AbsoluteURL(ctx.RequestData.Request, app.TenantHref()))
return ctx.Accepted()
}

Expand Down
18 changes: 12 additions & 6 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
Expand Up @@ -3,7 +3,7 @@ import:
- package: github.com/dgrijalva/jwt-go
version: ^3.0.0
- package: github.com/goadesign/goa
version: ^1.1.0
version: ^1.3.0
vcs: git
subpackages:
- client
Expand All @@ -19,7 +19,7 @@ import:
- middleware
- middleware/security/jwt
- package: github.com/fabric8-services/fabric8-wit
version: 58db841e76891f1251bdec86908c61360f11d375
version: ed49dd4d0678a97d13ba469efbd5cdea2e5dbe67
subpackages:
- log
- errors
Expand All @@ -36,7 +36,7 @@ import:
subpackages:
- golint
- package: github.com/fzipp/gocyclo
- package: github.com/Sirupsen/logrus
- package: github.com/sirupsen/logrus
- package: github.com/lib/pq
- package: github.com/stretchr/testify
subpackages:
Expand All @@ -57,4 +57,4 @@ import:
version: ^0.5.0
testImport:
- package: github.com/wadey/gocovmerge
- package: github.com/jstemmer/go-junit-report
- package: github.com/jstemmer/go-junit-report
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

_ "github.com/lib/pq"

"github.com/Sirupsen/logrus"
"github.com/fabric8-services/fabric8-tenant/app"
"github.com/fabric8-services/fabric8-tenant/configuration"
"github.com/fabric8-services/fabric8-tenant/controller"
Expand All @@ -27,6 +26,7 @@ import (
"github.com/goadesign/goa/middleware/gzip"
goajwt "github.com/goadesign/goa/middleware/security/jwt"
"github.com/jinzhu/gorm"
"github.com/sirupsen/logrus"

goalogrus "github.com/goadesign/goa/logging/logrus"
"github.com/spf13/viper"
Expand Down

0 comments on commit 1dc51b5

Please sign in to comment.