cleanup

RackHD · Sep 26, 2016 · 41b90b3 · 41b90b3
1 parent 96be29e
commit 41b90b3
Show file tree

Hide file tree

Showing 38 changed files with 5 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
diff --git a/libreg/README.md b/libreg/README.md
diff --git a/libreg/libreg.go b/libreg/libreg.go
diff --git a/libreg/registry/consul/consul.go b/libreg/registry/consul/consul.go
diff --git a/libreg/registry/mock/mock.go b/libreg/registry/mock/mock.go
diff --git a/libreg/registry/registry.go b/libreg/registry/registry.go
diff --git a/rackhd/Dockerfile-endpoint b/rackhd/Dockerfile-endpoint
diff --git a/rackhd/Dockerfile-rackhd b/rackhd/Dockerfile-rackhd
diff --git a/rackhd/README.md b/rackhd/README.md
diff --git a/rackhd/cmd/rackhd/main.go b/rackhd/cmd/rackhd/main.go
diff --git a/rackhd/cmd/utils/api/api.go b/rackhd/cmd/utils/api/api.go
diff --git a/rackhd/cmd/utils/main.go b/rackhd/cmd/utils/main.go
diff --git a/rackhd/docker-compose-rackhd.yaml b/rackhd/docker-compose-rackhd.yaml
diff --git a/rackhd/proxy/controller.go b/rackhd/proxy/controller.go
@@ -65,14 +65,8 @@ func (p *Server) HandleNodes(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(fmt.Sprintf("%s", err)))
 		return
 	}
-	if (r.Method == "") || (r.Method == "GET") {
-		cr, _ := p.GetResp(r, addrMap)
-		p.RespCheck(w, cr)
-	}
-	if r.Method == "POST" {
-		cr, _ := p.PostResp(r, addrMap)
-		p.RespCheck(w, cr)
-	}
+	cr, _ := p.GetResp(r, addrMap)
+	p.RespCheck(w, cr)
 }
 
 // GetResp makes channels for the response and errors from http.Get.
@@ -86,22 +80,22 @@ func (p *Server) GetResp(r *http.Request, addrs map[string]struct{}) (chan *Resp
 
 	for entry := range addrs {
 		p.wg.Add(1)
-		fmt.Printf("Entry => %+v\n", entry)
+		fmt.Printf("Entry => %+v\n\n", entry)
 		go func(entry string, r *http.Request) {
 			defer p.wg.Done()
 			req, err := NewRequest(r, entry)
 			if err != nil {
 				log.Printf("Error creating request => %s\n", err)
 				return
 			}
-			fmt.Printf("Request URL String in => %+v\n", r.URL.String())
+			fmt.Printf("Request => \n%+v\n\n", req)
 			client := cleanhttp.DefaultClient()
 			respGet, err := client.Do(req)
 			if err != nil {
 				errs <- fmt.Errorf("Could not send HTTP Get request to %s => %s\n", req.URL.String(), err)
 				return
 			}
-			fmt.Printf("RESP => %+v\n\n", respGet.Request.URL.String())
+			fmt.Printf("RESP URL => \n%+v\n\n\n", respGet.Body)
 			responseCopy, err := NewResponse(respGet)
 			if err != nil {
 				log.Printf("Error copying response => %s\n", err)
@@ -115,37 +109,6 @@ func (p *Server) GetResp(r *http.Request, addrs map[string]struct{}) (chan *Resp
 	return cr, errs
 }
 
-// PostResp sends a POST request to each address
-func (p *Server) PostResp(r *http.Request, addrs map[string]struct{}) (chan *Response, chan error) {
-	cr := make(chan *Response, len(addrs))
-	errs := make(chan error, len(addrs))
-	defer close(cr)
-	defer close(errs)
-	for entry := range addrs {
-		p.wg.Add(1)
-		go func(entry string) {
-			defer p.wg.Done()
-			r.URL.Host = entry
-			r.URL.Scheme = "http"
-			fmt.Printf("url string %s\n", r.URL.String())
-			respPost, err := http.Post(r.URL.String(), "application/json", r.Body)
-			if err != nil {
-				errs <- fmt.Errorf("Could not send HTTP Post request to %s => %s\n", r.URL.String(), err)
-				return
-			}
-			responseCopy, err := NewResponse(respPost)
-			if err != nil {
-				log.Printf("Error copying response => %s\n", err)
-				return
-			}
-			cr <- responseCopy
-			respPost.Body.Close()
-		}(entry)
-	}
-	p.wg.Wait()
-	return cr, errs
-}
-
 // GetAddresses decides from where to retrieve the addresses
 func (p *Server) GetAddresses(w http.ResponseWriter, r *http.Request) (map[string]struct{}, error) {
 	if err := r.ParseForm(); err != nil {

diff --git a/rackhd/proxy/response.go → rackhd/proxy/helper.go b/rackhd/proxy/response.go → rackhd/proxy/helper.go
diff --git a/rackhd/watcher/watcher_suite_test.go b/rackhd/watcher/watcher_suite_test.go
diff --git a/rackhd/watcher/watcher_test.go b/rackhd/watcher/watcher_test.go
diff --git a/registry/Dockerfile-registry b/registry/Dockerfile-registry
diff --git a/registry/Dockerfile-ssdp b/registry/Dockerfile-ssdp
diff --git a/registry/LICENSE b/registry/LICENSE
diff --git a/registry/README.md b/registry/README.md
diff --git a/registry/cmd/registry/main.go b/registry/cmd/registry/main.go
diff --git a/registry/cmd/ssdpspoofer/main.go b/registry/cmd/ssdpspoofer/main.go
diff --git a/registry/cmd/ssdpspoofer/ssdpSpoof.json b/registry/cmd/ssdpspoofer/ssdpSpoof.json
diff --git a/registry/docker-compose-registry.yaml b/registry/docker-compose-registry.yaml
diff --git a/registry/registry.go b/registry/registry.go
diff --git a/registry/registry.json b/registry/registry.json
diff --git a/registry/registry_suite_test.go b/registry/registry_suite_test.go
diff --git a/registry/registry_test.go b/registry/registry_test.go
diff --git a/registry/utils/ClearConsul/main.go b/registry/utils/ClearConsul/main.go
diff --git a/registry/utils/ssdpSpoofer/main.go b/registry/utils/ssdpSpoofer/main.go
diff --git a/registry/utils/ssdpSpoofer/ssdpSpoof.json b/registry/utils/ssdpSpoofer/ssdpSpoof.json