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

serve grpc and http on the same socket

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-09-01 12:37:10 +02:00
parent f3bbd44734
commit 39006d4cdd
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
10 changed files with 1109 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/inspect.go
View file

@ -3,7 +3,6 @@ package server
import (
"encoding/json"
"fmt"
"net"
"net/http"
"path/filepath"
@ -27,9 +26,8 @@ type CrioInfo struct {
StorageRoot string `json:"storage_root"`
}
// StartInfoEndpoints starts a http server that
// serves container information requests and crio daemon information
func (s *Server) StartInfoEndpoints(l net.Listener) error {
// GetInfoMux returns the mux used to serve info requests
func (s *Server) GetInfoMux() *bone.Mux {
mux := bone.New()
mux.Get("/info", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
@ -77,5 +75,5 @@ func (s *Server) StartInfoEndpoints(l net.Listener) error {
w.Write(js)
}))
return http.Serve(l, mux)
return mux
}