Matthias Radestock
3bd5ae56f0
fix make update
...
Trying to build the thing for which we want to fetch the dependencies
is rather silly.
2015-07-02 11:46:48 +01:00
Matthias Radestock
ecfc5d091d
Merge pull request #1053 from weaveworks/437-check-address
...
Check addresses supplied by users for conflict with existing routes.
Fixes #437 . Fixes #480 .
2015-07-01 15:03:28 +01:00
Bryan Boreham
84238a0262
Amend error message to reflect usage situation
2015-07-01 14:58:42 +01:00
Matthias Radestock
edf3ec9f09
Merge pull request #1044 from weaveworks/664-use-logrus
...
Use off-the-shelf logger logrus
Closes #664 .
2015-07-01 14:47:52 +01:00
Matthias Radestock
2fee0f0184
Merge branch '1.0'
2015-07-01 14:02:57 +01:00
Bryan Boreham
a5ddb63fca
Remove Info.Print in favour of Log.Info
2015-07-01 14:01:45 +01:00
Matthias Radestock
a05a3c4b26
Merge pull request #1054 from weaveworks/1042-reset-first-10
...
Call `weave reset` earlier in smoke-test set-up, to improve reliability
Fixes #1042 .
2015-07-01 14:01:29 +01:00
Bryan Boreham
a938608cc8
Call weave reset before deleting containers, to improve clean-down
2015-07-01 13:19:43 +01:00
Bryan Boreham
013380c7e7
Update router code to use common logger
2015-07-01 12:26:23 +01:00
Bryan Boreham
13c0b62f96
When looking at proxy logs, use both stderr and stdout
2015-07-01 12:26:23 +01:00
Bryan Boreham
7276fc1d4b
Wire up selection of logging levels to match old behaviour
...
- note that all output is now going to stderr.
2015-07-01 12:26:23 +01:00
Bryan Boreham
67a6961b4b
Adjust logrus feature of padding all lines less than 44 chars with spaces at the end
2015-07-01 12:26:23 +01:00
Bryan Boreham
d82578d895
Replace logging calls with new style
2015-07-01 12:26:23 +01:00
Bryan Boreham
c786e7eb5a
Switch from basic logger to logrus
2015-07-01 12:26:23 +01:00
Bryan Boreham
91099694c9
Send error message to stderr
2015-07-01 12:17:02 +01:00
Bryan Boreham
c9a20ae10c
Warn user if they are trying to use a specific address that clashes with an existing route
2015-07-01 12:17:02 +01:00
Bryan Boreham
f05225da22
Check specific addresses differently to networks
...
For a network, as used by IPAM, we care if *any* address in the range
could possibly conflict with an existing address routed by the host.
When given a single address, we only care if *that specific address*
conflicts with an existing route.
2015-07-01 12:15:04 +01:00
Matthias Radestock
badfdee5e4
Merge branch '1.0'
2015-07-01 11:34:50 +01:00
Matthias Radestock
ba1e75405f
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-01 11:34:24 +01:00
Matthias Radestock
0f5f671054
Merge pull request #1051 from weaveworks/issues/1046-clarify-weavedns-docs
...
Draw attention to --hostname precedence
Fixes #1046 .
2015-07-01 11:33:24 +01:00
Adam Harrison
5b9d350002
Draw attention to --hostname precedence
2015-07-01 11:15:08 +01:00
Bryan Boreham
6403e7a11c
Add missing rule to rebuild netcheck when its source changes
2015-07-01 11:13:40 +01:00
Matthias Radestock
312122e1be
fix typo
2015-07-01 10:30:12 +01:00
Matthias Radestock
bb1da63bfc
Merge pull request #1048 from squaremo/issue1040_eliminate_ipam_mentions
...
Remove references to 'IPAM' in docs and UI
Closes #1040 .
2015-06-29 23:15:58 +01:00
Matthias Radestock
d1b2e74985
Merge pull request #1045 from squaremo/issue1041_usage_for_initpeercount
...
Add -initpeercount to usage
Closes #1041 .
2015-06-29 19:48:52 +01:00
Michael Bridgen
c0b2fe3e3b
Remove references to 'IPAM' in docs and UI
...
The option `--no-default-ipam` is replaced with
`--no-default-ipalloc`; the former will still work (in a 'last one
wins' way), but its usage message says it's deprecated.
2015-06-29 19:20:26 +01:00
Michael Bridgen
864461918f
Add -initpeercount to usage
2015-06-29 17:06:14 +01:00
Matthias Radestock
9127eb8acf
cosmetic: make weave run usage fit in 80 columns
2015-06-29 16:56:57 +01:00
Paul Bellamy
8e629d9471
Merge pull request #999 from paulbellamy/scope-tests
...
Let Scope use these integration test helpers
2015-06-29 13:51:26 +01:00
Matthias Radestock
ab943d938a
refactor: don't return encoder from handshake()
...
We did this for symmetry/completeness, but the encoder is actually
"consumed" by handshake() in the creation of the tcp senders, hence it
is in fact dangerous to return it.
2015-06-29 12:38:21 +01:00
David Wragg
d6fedc1e6e
Remove error return value from DecodeLayers
...
It is never checked, so add a comment explaining why.
2015-06-29 10:47:56 +01:00
David Wragg
3222478449
Remove the LogFrame when fragmenting
...
Subsequent commits make this LogFrame call a little tricky to retain,
and it's not clear that it is really needed.
2015-06-29 10:47:26 +01:00
Paul Bellamy
26cb65c357
making test helpers more robust so scope can use them
2015-06-29 10:22:10 +01:00
Paul Bellamy
1ef3bd3a8b
add docker version and weave version to test sanity checks
2015-06-29 10:20:55 +01:00
Matthias Radestock
51ecf05091
cosmetic: fix typo in comment
2015-06-27 09:35:14 +01:00
Bryan Boreham
565454d3cb
fixed Logf format specifier
2015-06-26 17:22:35 +01:00
Matthias Radestock
906ff210fe
Merge pull request #1026 from weaveworks/1003-proxy-unix-socket
...
Make proxy listen on unix:///var/run/weave.sock
Closes #1003
2015-06-26 16:44:41 +01:00
Tom Wilkie
c4565f6ed3
Make proxy listen on /var/run/weave.sock
2015-06-26 15:08:21 +00:00
Matthias Radestock
8dd9020803
Merge branch '1.0'
...
Conflicts:
ipam/allocator_test.go
2015-06-26 14:08:09 +01:00
Matthias Radestock
ec62029db5
Merge pull request #1024 from weaveworks/982-fix-mock-gossip3
...
Flush messages from mock gossip in IPAM test
Fixes #982 .
2015-06-26 13:44:57 +01:00
Matthias Radestock
55fbffef75
Merge pull request #1009 from awh/weave_launch_all_the_things
...
Weave launch all the things
Closes #962 .
2015-06-26 13:21:44 +01:00
Bryan Boreham
c84c5dbcdf
Make TestGossipRouter goroutine easier to follow
2015-06-26 11:53:14 +01:00
Bryan Boreham
6725c8355f
Check the result of Allocate in TestFakeRouterSimple()
2015-06-26 11:53:03 +01:00
Bryan Boreham
c659e3448a
Add a flush() function to the mock gossip router, and call it where required
2015-06-26 11:40:58 +01:00
Bryan Boreham
959e5f0082
Use different object types for mock gossip messages
2015-06-26 11:38:25 +01:00
Bryan Boreham
6488b0d11c
More idiomatic exitChan
2015-06-26 11:38:07 +01:00
Matthias Radestock
039a2030db
refactor: make DF flag passing logic more obvious
...
...and provide a better abstraction for sending special frames.
2015-06-26 11:11:17 +01:00
Matthias Radestock
33d85aaee5
Merge pull request #1016 from dpw/defer-df
...
Don't inspect the DF flag earlier than we need to
2015-06-26 11:10:42 +01:00
Adam Harrison
d4c1766532
Fix smoke tests
2015-06-26 11:10:08 +01:00
Matthias Radestock
39a6d1c87e
refactor: simplify a test
2015-06-25 20:13:03 +01:00
Matthias Radestock