status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,721 Commits 445 Branches 179 Tags 489 MiB
Commit Graph

6721 Commits

Author SHA1 Message Date
Frank Schröder 825f72f5ef agent: support custom header and method for http checks (#3106) 
This patch adds support for custom headers and
method for HTTP checks.

Fixes #2474
Fixes #2657
Fixes #3106
 2017-06-07 01:11:56 +02:00
Katie Bayes e82884e983 Merge branch 'master' of https://github.com/katiebayes/consul 2017-06-06 16:02:32 -04:00
Katie Bayes fb2b4776c5 update middleman version 2017-06-06 16:00:11 -04:00
James Phillips 2b4f31dfc0 Merge pull request #3116 from hashicorp/reup-certs 
Updates unit test certs for another year.
 2017-06-05 19:23:04 -07:00
James Phillips 6f7ff554d0
Updates unit test certs for another year. 2017-06-05 19:22:20 -07:00
James Phillips 2424e31fa9 Merge pull request #3114 from hashicorp/minor_readme_fixes 
update README to mention using CONSUL_DEV
 2017-06-05 17:34:52 -07:00
Preetha Appan 5f140b1690 update README to mention using CONSUL_DEV 2017-06-05 15:49:50 -07:00
Frank Schroeder 94b39557e8 test: refactor TestDecodeConfig test 
This patch refactors the multiple tests for
DecodeConfig into a single table-driven test
that tests most fields individually.
 2017-06-04 23:55:12 +02:00
Frank Schroeder 325f82972a test: Fix TestAgent_Reload 
This test was still referring to cmd.agent which has been removed.
 2017-06-04 22:45:40 +02:00
Katie Bayes 5648e5e5a8 add enterprise badge style alert boxes, change guides/areas.html.md to erb file 2017-06-04 01:30:21 -04:00
James Phillips 240413f5d6 Merge pull request #3105 from hashicorp/test-stability 
Tweaks things for better test stability.
 2017-06-03 10:09:12 -07:00
Frank Schroeder 51e0e158f1 agent: fix graceful http server shutdown 2017-06-03 19:08:50 +02:00
Frank Schroeder ae711c3b04 agent: cleanup run method 2017-06-03 19:08:50 +02:00
Frank Schroeder b203ffab29 agent: move registerWatches out of the run method 2017-06-03 19:08:50 +02:00
Frank Schroeder 11245e53a7 agent: move telemetry out of the run method 2017-06-03 19:08:50 +02:00
Frank Schroeder 84f5e8c3ab agent: move update check out of the run method 2017-06-03 19:08:50 +02:00
Frank Schroeder 96d8035adc agent: simplify signal handling 2017-06-03 19:08:50 +02:00
Frank Schroeder 34fd31b7b1 agent: move config reloading into the agent 2017-06-03 19:08:50 +02:00
Frank Schroeder aa1519c9f7 agent: move parseMetaPair to config and export 2017-06-03 19:08:50 +02:00
Frank Schroeder cb98754cd6 agent: remove agent from command 
Decouple command and agent a bit more.
 2017-06-03 19:08:50 +02:00
Frank Schroeder d977aa1fe7 agent: move retry join into agent 2017-06-03 19:08:50 +02:00
Frank Schroeder 55a513da2e agent: add GossipEncrypted function 
Remove dead code and expose a GossipEncrypted() method
on the agent instead of accessing the internal delegate.
 2017-06-03 19:08:50 +02:00
James Phillips 65bbad0975 Update CHANGELOG.md 2017-06-02 21:45:14 -07:00
James Phillips cbedf92157 Update CHANGELOG.md 2017-06-02 21:45:03 -07:00
James Phillips 3baa703d02 Merge pull request #3077 from jwasinger/issue-2850 
Prevent Session.Destroy from leaving open TCP connections
 2017-06-02 21:43:55 -07:00
James Phillips b0b5df579f
Cleans up an unrelated vet error. 2017-06-02 21:07:15 -07:00
James Phillips b4b5036dfb
Adds back the port shuffle on agent start retries. 2017-06-02 20:53:20 -07:00
James Phillips 9c8f656a29
Takes parallel away from some currently flaky tests. 2017-06-02 18:07:27 -07:00
James Phillips 86003d91a2 Merge pull request #3104 from hashicorp/bad-shutdown 
Cleans up incorrect router shutdown.
 2017-06-02 16:38:08 -07:00
James Phillips 798120d0c4
Cleans up incorrect router shutdown. 
Fixes #3102.
 2017-06-02 16:33:48 -07:00
James Phillips da9ab5985f Merge pull request #3103 from hashicorp/fail-for-sure 
Makes test target fail based on return code from go test.
 2017-06-02 15:10:45 -07:00
James Phillips e9ee136baf
Makes test target fail based on return code from go test. 2017-06-02 15:09:07 -07:00
James Phillips d9fb90be6a Update CHANGELOG.md 2017-06-02 09:33:58 -07:00
James Phillips 555cc9b44a Update CHANGELOG.md 2017-06-02 09:07:31 -07:00
James Phillips 5f9776ac89 Merge pull request #2621 from alicebob/devwatch 
reset watch's lastIndex on error
 2017-06-02 09:06:02 -07:00
Frank Schroeder 68cac3d40c
Revert "test: run all tests together again" 
This reverts commit e48df7b572.
 2017-06-02 07:52:21 +02:00
Frank Schroeder 4403db0d63
vendor: Update github.com/shirou/gopsutil 
Pull in fix for data race on host.BootTime.
 2017-06-02 07:51:08 +02:00
Frank Schroeder c5ba51db19
vendor: upgrade github.com/armon/go-metrics 
Pull in changes to fix race condition for concurrent tests.
 2017-06-01 23:52:26 +02:00
Frank Schroeder 375825f34c Do not recurse when the service address is a local cname 
Fixes #2795
 2017-06-01 18:20:31 +02:00
Frank Schroeder 9956bc9b47 agent: LastContact cannot be negative (#3067) 
The X-Consul-LastContact header cannot be negative.

Fixes #3067
 2017-06-01 18:20:12 +02:00
Frank Schroeder e23cd5acb6
vendor: upgrade github.com/go-ole/go-ole 
This replaces the monkey patch for github.com/go-ole/go-ole/pull/144

See #3097
 2017-06-01 16:05:24 +02:00
Frank Schroeder 6c0bccbc06
vendor: monkey patch github.com/go-ole/go-ole support for s390x 
Remove this once https://github.com/go-ole/go-ole/pull/144 gets
merged.

Fixes #3097
 2017-06-01 15:31:29 +02:00
Frank Schroeder 8051d4a1da
Revert "vendor: monkey patch github.com/go-ole/go-ole support for s390x" 
This reverts commit 50fe2148a8.
 2017-06-01 15:31:02 +02:00
Frank Schroeder 50fe2148a8
vendor: monkey patch github.com/go-ole/go-ole support for s390x 
Remove this once https://github.com/go-ole/go-ole/pull/144 gets
merged.
 2017-06-01 15:29:47 +02:00
Frank Schroeder 8b9d1603ac
test: use random ports for consul tests 2017-05-31 12:15:55 +02:00
Frank Schroeder db15cd847a
test: replace one more BoolFalse with agent.Bool() 2017-05-31 11:41:17 +02:00
Frank Schroeder dcc68f0f85
test: we will not use dev mode for testing for now 2017-05-31 11:34:00 +02:00
Frank Schroeder f89ae9f7e7
test: stagger retry attempts of TestAgent.Start 2017-05-31 11:33:25 +02:00
Frank Schroeder bdfed817ee
test: make TestAgent setup reusable 
Pick the random ports only once and try starting with them
a number of times so that the configuration can be re-used.
This is because the ports are written into the data files
and a subsequent agent reading the files needs to have the
same ports.

For the same reason we do not remove the data directory on
every attempt since this makes it impossible to re-read the
data files.
 2017-05-31 11:32:31 +02:00
Frank Schroeder 4034d0ac0b
agent: use agent logger for consul client and deps 2017-05-31 11:05:02 +02:00