add more patterns

Author: ChristianKniep

README.md

@@ -36,18 +36,22 @@ See 'docker run --help'.
 Once the method is checked, a list of regular expressions are checked. In version 0.1.0 the list reads:
 
 ```bash
-# List and inspect containers
-^/(v\d\.\d+/)?containers(/\w+)?/json$
+# List, inspect, metrics and processes of containers
+^/(v\d\.\d+/)?containers(/\w+)?/(json|stats|top)$
 # List and inspect services
 ^/(v\d\.\d+/)?services(/[0-9a-f]+)?$
 # List and inspect tasks
 ^/(v\d\.\d+/)?tasks(/\w+)?$
 # List and inspect networks
 ^/(v\d\.\d+/)?networks(/\w+)?$
+# List and inspect volumes
+^/(v\d\.\d+/)?volumes(/\w+)?$
 # List and inspect nodes
 ^/(v\d\.\d+/)?nodes(/\w+)?$
 # Show engine info
 ^/(v\d\.\d+/)?info$
+# Show engine version
+^/(v\d\.\d+/)?version$
 # Healthcheck
 ^/_ping$
 ```

doxy.pattern

@@ -1,14 +1,18 @@
-# List and inspect containers
-^/(v\d\.\d+/)?containers(/\w+)?/json$
+# List, inspect, metrics and processes of containers
+^/(v\d\.\d+/)?containers(/\w+)?/(json|stats|top)$
 # List and inspect services
 ^/(v\d\.\d+/)?services(/[0-9a-f]+)?$
 # List and inspect tasks
 ^/(v\d\.\d+/)?tasks(/\w+)?$
 # List and inspect networks
 ^/(v\d\.\d+/)?networks(/\w+)?$
+# List and inspect volumes
+^/(v\d\.\d+/)?volumes(/\w+)?$
 # List and inspect nodes
 ^/(v\d\.\d+/)?nodes(/\w+)?$
 # Show engine info
 ^/(v\d\.\d+/)?info$
+# Show engine version
+^/(v\d\.\d+/)?version$
 # Healthcheck
 ^/_ping$

main.go

@@ -6,8 +6,6 @@ import (
 	"github.com/zpatrick/go-config"
 	"github.com/codegangsta/cli"
 	"github.com/qnib/doxy/proxy"
-	"bufio"
-	"strings"
 )
 
 
@@ -19,20 +17,19 @@ func RunApp(ctx *cli.Context) {
 	debug, _ := cfg.Bool("debug")
 	patternsFile, _ := cfg.String("pattern-file")
 	reader, err := os.Open(patternsFile)
-	if err != nil {
-		return
-	}
 	defer reader.Close()
-	patterns, err  := proxy.ReadPatterns(reader)
+	patterns := []string{}
 	if err != nil {
 		log.Printf("Error reading patterns file (%s), using default patterns\n", err.Error())
 		patterns = []string{
-			`^/(v\d\.\d+/)?containers(/\w+)?/json$`,
+			`^/(v\d\.\d+/)?containers(/\w+)?/(json|stats|top)$`,
 			`^/(v\d\.\d+/)?services(/[0-9a-f]+)?$`,
 			`^/(v\d\.\d+/)?tasks(/\w+)?$`,
 			`^/(v\d\.\d+/)?networks(/\w+)?$`,
+			`^/(v\d\.\d+/)?volumes(/\w+)?$`,
 			`^/(v\d\.\d+/)?nodes(/\w+)?$`,
 			`^/(v\d\.\d+/)?info$`,
+			`^/(v\d\.\d+/)?version$`,
 			"^/_ping$",
 		}
 		if debug {
@@ -41,6 +38,8 @@ func RunApp(ctx *cli.Context) {
 			}
 
 		}
+	} else {
+		patterns, err  = proxy.ReadPatterns(reader)
 	}
 	p := proxy.NewProxy(newSock, dockerSock, debug)
 	p.AddPatterns(patterns)

proxy/main.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"log"
 	"net/http"
 	"os"
 	"syscall"
@@ -45,6 +46,7 @@ func (p *Proxy) Run() {
 		n.Use(negroni.NewLogger())
 	}
 	n.UseHandler(upstream)
+	log.Printf("Serving proxy on '%s'", p.newSocket)
 	if err = http.Serve(l, n); err != nil {
 		panic(err)
 	}