vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

server: Use crio socket for info/inspect endpoints

Browse source 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
This commit is contained in:
Mrunal Patel 2017-08-31 08:45:49 -07:00
parent f08a5f7162
commit a913cb0b5d
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/inspect.go
View file

@ -3,6 +3,7 @@ package server
import (
"encoding/json"
"fmt"
"net"
"net/http"
"path/filepath"
@ -28,7 +29,7 @@ type CrioInfo struct {
// StartInfoEndpoints starts a http server that
// serves container information requests and crio daemon information
func (s *Server) StartInfoEndpoints() error {
func (s *Server) StartInfoEndpoints(l net.Listener) error {
mux := bone.New()
mux.Get("/info", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
@ -76,6 +77,5 @@ func (s *Server) StartInfoEndpoints() error {
w.Write(js)
}))
// TODO: Make this configurable
return http.ListenAndServe("localhost:7373", mux)
return http.Serve(l, mux)
}