Skip to content
Merged
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
37 changes: 21 additions & 16 deletions glide.lock

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

10 changes: 5 additions & 5 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package: github.com/lyft/ratelimit
import:
- package: github.com/golang/mock
version: bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
version: master
subpackages:
- gomock
- package: github.com/kelseyhightower/envconfig
version: 1.1.0
- package: github.com/lyft/gostats
version: 20442a7429a7bfca84f2b88ec833b3901530db2c
version: v0.2.6
- package: github.com/lyft/goruntime
version: 6b40116c86cb185340f0252a3cd0071b4ee3396b
version: v0.1.8
- package: github.com/mediocregopher/radix.v2
version: master
subpackages:
- pool
- redis
- package: github.com/Sirupsen/logrus
version: ^0.11.0
- package: github.com/sirupsen/logrus
version: ^1.0
- package: golang.org/x/net
version: master
subpackages:
Expand Down
2 changes: 1 addition & 1 deletion src/config/config_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

logger "github.com/Sirupsen/logrus"
"github.com/lyft/gostats"
pb "github.com/lyft/ratelimit/proto/ratelimit"
logger "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion src/redis/cache_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"sync"
"time"

logger "github.com/Sirupsen/logrus"
pb "github.com/lyft/ratelimit/proto/ratelimit"
"github.com/lyft/ratelimit/src/assert"
"github.com/lyft/ratelimit/src/config"
logger "github.com/sirupsen/logrus"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion src/redis/driver_impl.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package redis

import (
logger "github.com/Sirupsen/logrus"
"github.com/lyft/gostats"
"github.com/lyft/ratelimit/src/assert"
"github.com/lyft/ratelimit/src/settings"
"github.com/mediocregopher/radix.v2/pool"
"github.com/mediocregopher/radix.v2/redis"
logger "github.com/sirupsen/logrus"
)

type poolStats struct {
Expand Down
4 changes: 2 additions & 2 deletions src/server/server_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (

"net"

logger "github.com/Sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/kavu/go_reuseport"
"github.com/lyft/goruntime/loader"
"github.com/lyft/gostats"
"github.com/lyft/ratelimit/src/settings"
logger "github.com/sirupsen/logrus"
"google.golang.org/grpc"
)

Expand Down Expand Up @@ -121,7 +121,7 @@ func newServer(name string, opts ...settings.Option) *server {
ret.store.AddStatGenerator(stats.NewRuntimeStats(ret.scope.Scope("go")))

// setup runtime
ret.runtime = loader.New(s.RuntimePath, s.RuntimeSubdirectory, ret.store.Scope("runtime"))
ret.runtime = loader.New(s.RuntimePath, s.RuntimeSubdirectory, ret.store.Scope("runtime"), &loader.SymlinkRefresher{s.RuntimePath})

// setup http router
ret.router = mux.NewRouter()
Expand Down
2 changes: 1 addition & 1 deletion src/service/ratelimit.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"strings"
"sync"

logger "github.com/Sirupsen/logrus"
"github.com/lyft/goruntime/loader"
"github.com/lyft/gostats"
pb "github.com/lyft/ratelimit/proto/ratelimit"
"github.com/lyft/ratelimit/src/assert"
"github.com/lyft/ratelimit/src/config"
"github.com/lyft/ratelimit/src/redis"
logger "github.com/sirupsen/logrus"
"golang.org/x/net/context"
)

Expand Down
40 changes: 24 additions & 16 deletions test/mocks/runtime/loader/loader.go

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

Loading