Skip to content
This repository was archived by the owner on Sep 26, 2018. It is now read-only.

Add Sidecar MaxConn support without other functionality changes #8

Merged
mihaitodor merged 13 commits into from
May 16, 2017
Merged

Add Sidecar MaxConn support without other functionality changes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d9ecea8
Fix resource leak
mihaitodor Apr 27, 2017
c5487bb
Fix Sidecar test naming scheme
mihaitodor Apr 27, 2017
7eaef5e
Refactor unit tests
mihaitodor Apr 27, 2017
ade3531
Add maxconn functionality
mihaitodor Apr 27, 2017
4afc4dd
Fix linter suggestions
mihaitodor Apr 28, 2017
4227eb9
Change MaxConns default value to match HAProxy
mihaitodor Apr 28, 2017
70f924d
Get the entire state from the Sidecar watcher
mihaitodor May 3, 2017
5827a15
Do proper setup/teardown with Convey
mihaitodor May 3, 2017
8f5c465
Use the recommended version of httpmock
mihaitodor May 3, 2017
027ce69
Use a pool for every goroutine
mihaitodor May 9, 2017
a8a8cc8
Rename the parameter for the sidecar.toml file
mihaitodor May 9, 2017
dbdbb90
Revert using the goroutine pool for decodeStream
mihaitodor May 9, 2017
726472c
Add MaxConn field for the frontends config TOML
mihaitodor May 9, 2017
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
2 changes: 1 addition & 1 deletion configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration {
var defaultSidecar provider.Sidecar
defaultSidecar.Watch = true
defaultSidecar.Endpoint = "http://127.0.0.1:7777"
defaultSidecar.Frontend = "sidecar.toml"
defaultSidecar.Filename = "sidecar.toml"
defaultSidecar.RefreshConn = flaeg.Duration(60 * time.Second)

//default Docker
Expand Down
32 changes: 18 additions & 14 deletions glide.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ import:
version: a1dba9ce8baed984a2495b658c82687f8157b98f
subpackages:
- xfs
- package: github.com/jarcoal/httpmock
version: 4442edb3db31196622da56482fd8d0fa375fba4d
- package: gopkg.in/jarcoal/httpmock.v1
version: cf52904a3cf0f78f199ecade6a6df8e245d5b25a
- package: github.com/smartystreets/assertions
version: edb6e295a22c57a2aa353b2f0729b6eff9f9f4b7
subpackages:
Expand Down
Loading