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.

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

start recovering streams - WIP #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@ announce:
$(call becho,"=== Ello Streams Project ===")

get-tools:
@go get -u "github.com/Masterminds/glide"
@go build "github.com/Masterminds/glide"
@go get -u "github.com/alecthomas/gometalinter"
go install "github.com/Masterminds/glide"
# @go get -u "github.com/Masterminds/glide"
# @go build "github.com/Masterminds/glide"
# @go get -u "github.com/alecthomas/gometalinter"
# This is broken for the moment due to https://github.com/opennota/check/issues/25
# When that's fixed we can go back to the `gometalinter` command instead of individual installs
# @gometalinter --install --update --force
@go get -u -f "golang.org/x/tools/cmd/goimports"
@go get -u -f "github.com/kisielk/errcheck"
@go get -u -f "github.com/gordonklaus/ineffassign"
@go get -u -f "github.com/mibk/dupl"
@go get -u -f "github.com/alecthomas/gometalinter"
@go get -u -f "golang.org/x/tools/cmd/gotype"
@go get -u -f "github.com/tsenart/deadcode"
@go get -u -f "github.com/alecthomas/gocyclo"
@go get -u -f "github.com/mvdan/interfacer/cmd/interfacer"
@go get -u -f "github.com/golang/lint/golint"
go install "golang.org/x/tools/cmd/goimports"
go install "github.com/kisielk/errcheck"
go install "github.com/gordonklaus/ineffassign"
go install "github.com/mibk/dupl"
go install "github.com/alecthomas/gometalinter"
go install "golang.org/x/tools/cmd/gotype"
go install "github.com/tsenart/deadcode"
go install "github.com/alecthomas/gocyclo"
go install "github.com/mvdan/interfacer/cmd/interfacer"
go install "github.com/golang/lint/golint"
@$(PRINT_OK)

install:export GO15VENDOREXPERIMENT=1
Expand Down
4 changes: 2 additions & 2 deletions api/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"net/http"
"strings"

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

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/julienschmidt/httprouter"
"github.com/unrolled/render"
)
Expand Down
2 changes: 1 addition & 1 deletion api/controllers_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/ello/streams/api"
"github.com/ello/streams/model"
"github.com/julienschmidt/httprouter"
Expand Down
2 changes: 1 addition & 1 deletion api/health_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/julienschmidt/httprouter"
metrics "github.com/rcrowley/go-metrics"
)
Expand Down
2 changes: 1 addition & 1 deletion api/stream_controller.go
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"
"github.com/ello/streams/model"
"github.com/ello/streams/service"
"github.com/ello/streams/util"
Expand Down
Binary file added glide
Binary file not shown.
111 changes: 111 additions & 0 deletions glide.lock

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

10 changes: 8 additions & 2 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
package: github.com/ello/streams

import:
- package: github.com/onsi/ginkgo
- package: github.com/onsi/ginkgo/ginkgo
version: v1.16.5

- package: github.com/onsi/gomega
- package: github.com/julienschmidt/httprouter
- package: github.com/golang/protobuf
subpackages:
- /proto
- package: github.com/Sirupsen/logrus

- package: github.com/sirupsen/logrus
version: master

- package: gopkg.in/gemnasium/logrus-airbrake-hook.v2
- package: github.com/m4rw3r/uuid
- package: github.com/unrolled/render
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module ello.co/streams

go 1.17
Empty file added go.sum
Empty file.
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/codegangsta/negroni"
"github.com/ello/streams/api"
"github.com/ello/streams/service"
Expand Down
2 changes: 1 addition & 1 deletion model/roshi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/ello/streams/model"
"github.com/m4rw3r/uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion service/roshi.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"net/url"
"time"

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

"github.com/ello/streams/model"
)
Expand Down
2 changes: 1 addition & 1 deletion service/service_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package service_test
import (
"testing"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down