Commit Graph

3364 Commits

Author SHA1 Message Date
8c09f98882 chore(etcd): cleanup TLS configuration
the TLS configuration was getting rather complex with slices of
tls.Config's being passed around and pointer nil checking for schema
types.

Introduce a new TLSInfo type that is in charge of holding the various
TLS key/cert/CA filenames the user passes in.

Then create a new TlsConfig type that has a Scheme and the Client and
Server tls.Config objects inside of it. This is used by the two
transport start methods which had been using a slice of tls.Config
objects and guessing at the scheme based on the non-nil value of the
Config.
2013-08-10 19:31:54 -07:00
9111617f32 chore(etcd): introduce sanitizeURL
checkURL was a little weird and allowed two different ways to specify
flags. Introduce sanitizeURL which will make sure the host passed in is
simply hostname:port and then appends a Scheme.
2013-08-10 19:22:04 -07:00
6610fc39cc defaultScheme based on tls 2013-08-10 17:49:30 -07:00
84624f1ec0 fix join command 2013-08-10 17:00:25 -07:00
bbf78b076a update 2013-08-10 16:23:51 -07:00
ba697f6ac9 fix web 2013-08-10 16:20:00 -07:00
60c71a98a4 fix(etcd): checkURL on webURL
make it so that dropping the schema isn't fatal.
2013-08-10 11:01:09 -07:00
0e5ee2742d fix(web): don't share the DefaultMux
All of the web handlers were sharing one mux. Separate them out into
individual muxes.
2013-08-10 10:54:59 -07:00
8174669519 fix(etcd): be more explicit with name error message 2013-08-10 09:42:39 -07:00
328b92e8e7 able to get root dir 2013-08-10 09:42:23 -07:00
076bd9903e Merge pull request #78 from xiangli-cmu/separate_id
Separate id
2013-08-10 09:37:32 -07:00
ce3c55ba3f refactor 2013-08-09 23:03:49 -07:00
d3471eec7f separate_id 2013-08-09 21:06:16 -07:00
eadced5dc8 Merge branch 'separate-id' of https://github.com/philips/etcd into separate_id 2013-08-09 17:16:35 -07:00
0bb9fe9f50 hack(go-etcd): stop appending schema to everything
trying to get the new tests to pass.
2013-08-09 17:10:09 -07:00
a19048841f feat(trasnport): add an independent node name
Don't let the raft algorithm know anything about the transport. Give it
a nodename instead. This will allow us to support more complex
networking setups in the future.
2013-08-09 17:09:57 -07:00
06fab60dd6 simplify createTrans 2013-08-09 13:57:51 -07:00
7b38812575 Merge pull request #75 from philips/cleanup-README
README: misc cleanups
2013-08-08 21:15:02 -07:00
22ef9161c2 feat(README): add a tools and libraries section 2013-08-08 20:44:30 -07:00
fff8acaa22 fix conflict 2013-08-08 20:05:52 -07:00
054e75fea3 fix(README): misc language cleanups
Reduce the number of words and cleanup the language a bit.
2013-08-08 19:50:43 -07:00
2b648bfc13 chore(README): un-nest the sections 2013-08-08 19:50:28 -07:00
becc459abf chore(README): simplify explanation of the Index field 2013-08-08 19:03:58 -07:00
3de81f9f57 fix(README): cleanup wording on first etcd run 2013-08-08 17:04:00 -07:00
488a254af8 chore(README): it is Go not go 2013-08-08 17:03:42 -07:00
28685651bb Merge pull request #74 from philips/cherry-pick-mistobaan
cherry pick out Mistobaan's patches
2013-08-08 16:53:26 -07:00
1e62e92969 Merge pull request #73 from philips/fix-tests
fix(test): add sleep in createCluster
2013-08-08 16:48:12 -07:00
384d79d671 remove duplicate logic 2013-08-08 16:47:12 -07:00
f4fc4caf6f remove pointer to map 2013-08-08 16:47:00 -07:00
140bbfec38 nip 2013-08-08 16:46:49 -07:00
f5c2d19b90 nip 2013-08-08 16:46:39 -07:00
ab10f95911 set messager as send only 2013-08-08 16:46:29 -07:00
e0b8771950 fix(test): add sleep in createCluster
The problem is that if the master isn't up when the children start then
the children have to retry. This retry can take upwards of 15 seconds
which slows tests way down and some of them fail.
2013-08-08 16:44:10 -07:00
30c9b98310 Merge pull request #72 from philips/tests-do-not-listen-publicly
chore(*test.go): use 127.0.0.1
2013-08-08 14:28:07 -07:00
fd58cf8975 chore(*test.go): use 127.0.0.1
be polite and don't use public ip for listening during tests
2013-08-08 14:22:01 -07:00
b36feec757 Merge pull request #71 from philips/pretty-print-conf
chore(etcd): pretty print the conf json
2013-08-08 14:08:28 -07:00
5000e1de4a chore(etcd): pretty print the conf json
someone might edit this so pretty print it.
2013-08-08 13:59:45 -07:00
f6e5d29f58 Merge pull request #70 from philips/fixup-cli-options
Lots of cleanups around command line parsing
2013-08-08 13:59:15 -07:00
9d488f5529 fix(README): change -i to -f 2013-08-08 13:49:39 -07:00
04318ff1be fix(etcd): rename ignore to force
It was suprising that the ignore file deleted node configuration. Change
the name to force!
2013-08-08 13:27:00 -07:00
27000cf5df chore(etcd): un-nest error handling logic 2013-08-08 13:19:33 -07:00
99d69cf842 feat(etcd): print out log line of where the configuration is
It is a bit confusing that your flags are ignored if there is an
existing info file. Inform the user.
2013-08-08 13:11:29 -07:00
5e8f9a57a5 fix(etcd): use . as the storage
/tmp is convienent but a little unexpected. Just use the cwd.
2013-08-08 12:58:11 -07:00
6a9a0a6fbe fix(etcd): use Info structs for "start" functions
instead of passing in half of the info pass everything in as info
structs
2013-08-08 12:49:35 -07:00
8e5a24d367 chore(etcd): introduce argInfo variable
reduce the global sprawl and put all of the basic info in an instance of
Info Struct
2013-08-08 12:17:25 -07:00
f946ff0aab fix(etcd): log same port argument 2013-08-08 12:07:58 -07:00
17cfe22a55 bump(code.google.com/p/go.net): 3591c18acabc 2013-08-07 13:52:29 -07:00
044c6593a2 bump(github.com/ccding/go-config-reader): 02eda1a8218709cdcbd6fe2d53cd76128ac13526 2013-08-07 13:52:26 -07:00
b1f1af82f9 bump(github.com/coreos/go-etcd): c21388f46a08162660f44cc7c7267cc4c66d571e 2013-08-07 13:52:22 -07:00
8dc7dd7ea0 Merge pull request #68 from philips/refactor-third_party-a-bit
chore(update): put the deps into their own file
2013-08-07 09:51:48 -07:00