Merge pull request #26 from SpectoLabs/develop

Develop

Author: Karolis Rusenas

.gitignore

@@ -16,7 +16,6 @@ _test
 *.cgo2.c
 _cgo_defun.c
 _cgo_gotypes.go
-/vendor
 _cgo_export.*
 
 _testmain.go
@@ -31,3 +30,4 @@ hoverfly
 
 # examples/clients/readthedocs_query/test.py pickle file
 links.p
+static/js/node_modules

.gitmodules

@@ -0,0 +1,18 @@
+[submodule "redigo"]
+	path = vendor/github.com/garyburd/redigo
+	url = https://github.com/garyburd/redigo
+[submodule "logrus"]
+	path = vendor/github.com/Sirupsen/logrus
+	url = https://github.com/Sirupsen/logrus
+[submodule "goproxy"]
+	path = vendor/github.com/elazarl/goproxy
+	url = https://github.com/elazarl/goproxy
+[submodule "negroni-logrus"]
+	path = vendor/github.com/meatballhat/negroni-logrus
+	url = https://github.com/meatballhat/negroni-logrus
+[submodule "negroni"]
+    path = vendor/github.com/codegangsta/negroni
+    url = https://github.com/codegangsta/negroni
+[submodule "bone"]
+    path = vendor/github.com/go-zoo/bone
+    url = https://github.com/go-zoo/bone

admin.go

@@ -1,13 +1,15 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 
-	"encoding/json"
 	log "github.com/Sirupsen/logrus"
+	"github.com/codegangsta/negroni"
 	"github.com/go-zoo/bone"
+	"github.com/meatballhat/negroni-logrus"
 )
 
 // jsonResponse struct encapsulates payload data
@@ -24,6 +26,22 @@ type messageResponse struct {
 	Message string `json:"message"`
 }
 
+func (d *DBClient) startAdminInterface() {
+	// starting admin interface
+	mux := getBoneRouter(*d)
+	n := negroni.Classic()
+	n.Use(negronilogrus.NewMiddleware())
+	n.UseHandler(mux)
+
+	// admin interface starting message
+	log.WithFields(log.Fields{
+		"RedisAddress": AppConfig.redisAddress,
+		"AdminPort":    AppConfig.adminInterface,
+	}).Info("Admin interface is starting...")
+
+	n.Run(AppConfig.adminInterface)
+}
+
 // getBoneRouter returns mux for admin interface
 func getBoneRouter(d DBClient) *bone.Mux {
 	mux := bone.New()
@@ -35,6 +53,8 @@ func getBoneRouter(d DBClient) *bone.Mux {
 	mux.Get("/state", http.HandlerFunc(d.CurrentStateHandler))
 	mux.Post("/state", http.HandlerFunc(d.stateHandler))
 
+	mux.Handle("/*", http.FileServer(http.Dir("static")))
+
 	return mux
 }
 

hoverfly.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	log "github.com/Sirupsen/logrus"
-	"github.com/codegangsta/negroni"
 	"github.com/elazarl/goproxy"
-	"github.com/meatballhat/negroni-logrus"
 
 	"bufio"
 	"flag"
@@ -211,19 +209,3 @@ func (d *DBClient) processRequest(req *http.Request) (*http.Request, *http.Respo
 
 	}
 }
-
-func (d *DBClient) startAdminInterface() {
-	// starting admin interface
-	mux := getBoneRouter(*d)
-	n := negroni.Classic()
-	n.Use(negronilogrus.NewMiddleware())
-	n.UseHandler(mux)
-
-	// admin interface starting message
-	log.WithFields(log.Fields{
-		"RedisAddress": AppConfig.redisAddress,
-		"AdminPort":    AppConfig.adminInterface,
-	}).Info("Admin interface is starting...")
-
-	n.Run(AppConfig.adminInterface)
-}

readme.md

@@ -16,7 +16,6 @@ Then, build it:
 Run it:
 * ./hoverfly
 
-
 ## Destination configuration
 
 Specifying which site to record/virtualize with regular expression (by default it processes everything):
@@ -73,6 +72,12 @@ Add ca.pem to your trusted certificates or turn off verification, with curl you
 
     curl https://www.bbc.co.uk --proxy http://localhost:8500 -k
 
+## Administrator web UI
+
+By default proxy launches admin API and UI on port 8888. Access admin interface for basic operations on http://proxy_hostname:8888/.
+It uses same API as described below to change state, also allows to wipe captured requests/responses and show current count of records.
+For other functions such as export/import - use API directly.
+
 ## API
 
 Access administrator API under default port 8888: