Merge pull request #397 from philips/fixups-for-the-dashboard

Two dashboard fixups

mod/dashboard/app/scripts/common/services/etcd.js

@@ -88,7 +88,9 @@ angular.module('etcd', [])
     return newStat('leader').get().then(function(response) {
       return newKey('/_etcd/machines/' + response.data.leader).get().then(function(response) {
         // TODO: do something better here p.s. I hate javascript
-        var data = JSON.parse('{"' + decodeURI(response.data.value.replace(/&/g, "\",\"").replace(/=/g,"\":\"")) + '"}');
+        var data = decodeURIComponent(response.data.node.value);
+        data = data.replace(/&/g, "\",\"").replace(/=/g,"\":\"");
+        data = JSON.parse('{"' + data + '"}');
         return data.etcd;
       });
     });

mod/dashboard/app/scripts/controllers/browser.js

@@ -60,13 +60,13 @@ angular.module('etcdBrowser', ['ngRoute', 'etcd', 'timeRelative'])
       $('#etcd-browse-error').hide();
       // Looking at a directory if we got an array
       if (data.dir === true) {
-        $scope.list = data.kvs;
+        $scope.list = data.node.nodes;
         $scope.preview = 'etcd-preview-hide';
       } else {
         $scope.singleValue = data.value;
         $scope.preview = 'etcd-preview-reveal';
         $scope.key.getParent().get().success(function(data) {
-          $scope.list = data.kvs;
+          $scope.list = data.node.nodes;
         });
       }
       $scope.previewMessage = 'No key selected.';

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
 }