Commit fed689bb authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

packer/rpc: log when a muxconn is shut down

parent d811f6b0
...@@ -31,11 +31,14 @@ type Server struct { ...@@ -31,11 +31,14 @@ type Server struct {
mux *MuxConn mux *MuxConn
streamId uint32 streamId uint32
server *rpc.Server server *rpc.Server
closeMux bool
} }
// NewServer returns a new Packer RPC server. // NewServer returns a new Packer RPC server.
func NewServer(conn io.ReadWriteCloser) *Server { func NewServer(conn io.ReadWriteCloser) *Server {
return NewServerWithMux(NewMuxConn(conn), 0) result := NewServerWithMux(NewMuxConn(conn), 0)
result.closeMux = true
return result
} }
func NewServerWithMux(mux *MuxConn, streamId uint32) *Server { func NewServerWithMux(mux *MuxConn, streamId uint32) *Server {
...@@ -43,11 +46,17 @@ func NewServerWithMux(mux *MuxConn, streamId uint32) *Server { ...@@ -43,11 +46,17 @@ func NewServerWithMux(mux *MuxConn, streamId uint32) *Server {
mux: mux, mux: mux,
streamId: streamId, streamId: streamId,
server: rpc.NewServer(), server: rpc.NewServer(),
closeMux: false,
} }
} }
func (s *Server) Close() error { func (s *Server) Close() error {
return s.mux.Close() if s.closeMux {
log.Printf("[WARN] Shutting down mux conn in Server")
return s.mux.Close()
}
return nil
} }
func (s *Server) RegisterArtifact(a packer.Artifact) { func (s *Server) RegisterArtifact(a packer.Artifact) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment