Minor improvements to the muxchain api, allowing method mux to embed …

…in muxchain

muxchain.go

@@ -10,7 +10,7 @@ func Chain(pattern string, handlers ...http.Handler) {
 }
 
 type MuxChain struct {
-	*http.ServeMux
+	Muxer
 }
 
 func (m *MuxChain) ServeHTTPChain(w http.ResponseWriter, req *http.Request, handlers ...http.Handler) {
@@ -23,8 +23,8 @@ func (m *MuxChain) ServeHTTPChain(w http.ResponseWriter, req *http.Request, hand
 // of the chain is reached. If one of the handlers is a Muxer (e.g. http.ServeMux),
 // the MuxChain will skip it if no pattern matches.
 func (m *MuxChain) Chain(pattern string, handlers ...http.Handler) {
-	if m.ServeMux == nil {
-		m.ServeMux = http.NewServeMux()
+	if m.Muxer == nil {
+		m.Muxer = http.NewServeMux()
 	}
 	m.HandleFunc(pattern, func(w http.ResponseWriter, req *http.Request) {
 		if len(handlers) == 0 {
@@ -97,7 +97,10 @@ func handle(h http.Handler, remaining []http.Handler, w http.ResponseWriter, req
 
 // Muxer identifies types that act as a ServeMux.
 type Muxer interface {
+	http.Handler
+	Handle(pattern string, handler http.Handler)
 	Handler(r *http.Request) (h http.Handler, pattern string)
+	HandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request))
 }
 
 type checked struct {

muxchainutil/methodmux.go

@@ -39,6 +39,10 @@ func (m *MethodMux) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	h.ServeHTTP(w, req)
 }
 
+func (m *MethodMux) HandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) {
+	m.Handle(pattern, http.HandlerFunc(handler))
+}
+
 // HandleMethods registers a pattern to a handler for the given methods.
 func (m *MethodMux) HandleMethods(pattern string, h http.Handler, methods ...string) {
 	for _, method := range methods {

muxchainutil/panic.go

@@ -1,7 +1,9 @@
 package muxchainutil
 
 import (
+	"fmt"
 	"net/http"
+	"os"
 
 	"github.com/stephens2424/muxchain"
 )
@@ -26,6 +28,7 @@ func (p PanicRecovery) ServeHTTPChain(w http.ResponseWriter, req *http.Request,
 	defer func() {
 		if r := recover(); r != nil {
 			recovery.ServeHTTP(w, req)
+			fmt.Fprintln(os.Stderr, r)
 		}
 	}()
 	muxchain.HandleChain(w, req, h...)

sample/sample.go

@@ -6,8 +6,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/muxchain"
-	"github.com/muxchain/muxchainutil"
+	"github.com/stephens2424/muxchain"
+	"github.com/stephens2424/muxchain/muxchainutil"
 )
 
 func main() {