Browse Source

fix(server/registry): use url.Value.Encode()

Instead of open coding url encoding which lead to error, make it real
and use the library.
Brandon Philips 12 years ago
parent
commit
7e5aa3137d
2 changed files with 5 additions and 4 deletions
  1. 0 1
      mod/dashboard/app/scripts/controllers/browser.js
  2. 5 3
      server/registry.go

+ 0 - 1
mod/dashboard/app/scripts/controllers/browser.js

@@ -56,7 +56,6 @@ angular.module('etcdBrowser', ['ngRoute', 'etcd', 'timeRelative'])
       return;
     }
     $scope.key.get().success(function (data, status, headers, config) {
-      console.log(data)
       //hide any errors
       $('#etcd-browse-error').hide();
       // Looking at a directory if we got an array

+ 5 - 3
server/registry.go

@@ -38,14 +38,16 @@ func NewRegistry(s store.Store) *Registry {
 }
 
 // Adds a node to the registry.
-func (r *Registry) Register(name string, peerURL string, url string) error {
+func (r *Registry) Register(name string, peerURL string, machURL string) error {
 	r.Lock()
 	defer r.Unlock()
 
 	// Write data to store.
 	key := path.Join(RegistryKey, name)
-	value := fmt.Sprintf("raft=%s&etcd=%s", peerURL, url)
-	_, err := r.store.Create(key, false, value, false, store.Permanent)
+	v := url.Values{}
+	v.Set("raft", peerURL)
+	v.Set("etcd", machURL)
+	_, err := r.store.Create(key, false, v.Encode(), false, store.Permanent)
 	log.Debugf("Register: %s", name)
 	return err
 }