Merge pull request #140 from jrwren/001-add-access-log

add http access log

cmd/jemd/config.yaml

@@ -9,3 +9,4 @@ identity-location: http://localhost:8081/
 # agent-key: {private: VnTcdjEOBBBjHNJ9knRtMA0I1PCATNySJXhW4PGE5hY=, public: MusIzFaXa7ImSMcQ9wgGpaDrgRQhbtsjsyawTvmXh1c=}
 # For production identity manager (jemd will collect the correct public key on startup).
 #identity-location: https://api.jujucharms.com/identity
+access-log: /var/log/jem/access.log

cmd/jemd/main.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/gorilla/handlers"
 	// Include any providers known to support JEM.
 	// Avoid including provider/all to reduce build time.
 	_ "github.com/juju/juju/provider/ec2"
@@ -21,6 +22,7 @@ import (
 	"gopkg.in/macaroon-bakery.v1/bakery"
 	"gopkg.in/macaroon-bakery.v1/httpbakery"
 	"gopkg.in/mgo.v2"
+	"gopkg.in/natefinch/lumberjack.v2"
 
 	"github.com/CanonicalLtd/jem"
 	"github.com/CanonicalLtd/jem/config"
@@ -96,7 +98,17 @@ func serve(confPath string) error {
 	if err != nil {
 		return errgo.Notef(err, "cannot create new server at %q", conf.APIAddr)
 	}
+	handler := server.(http.Handler)
+	if conf.AccessLog != "" {
+		accesslog := &lumberjack.Logger{
+			Filename:   conf.AccessLog,
+			MaxSize:    500, // megabytes
+			MaxBackups: 3,
+			MaxAge:     28, //days
+		}
+		handler = handlers.CombinedLoggingHandler(accesslog, handler)
+	}
 
 	logger.Infof("starting the API server")
-	return http.ListenAndServe(conf.APIAddr, server)
+	return http.ListenAndServe(conf.APIAddr, handler)
 }

config/config.go

@@ -24,6 +24,7 @@ type Config struct {
 	IdentityLocation  string            `yaml:"identity-location"`
 	AgentUsername     string            `yaml:"agent-username"`
 	AgentKey          *bakery.KeyPair   `yaml:"agent-key"`
+	AccessLog         string            `yaml:"access-log"`
 }
 
 func (c *Config) validate() error {

dependencies.tsv

@@ -3,6 +3,7 @@ github.com/coreos/go-systemd	git	7b2428fec40033549c68f54e26e89e7ca9a9ce31	2016-0
 github.com/dustin/go-humanize	git	145fabdb1ab757076a70a886d092a3af27f66f4c	2014-12-28T07:11:48Z
 github.com/godbus/dbus	git	32c6cc29c14570de4cf6d7e7737d68fb2d01ad15	2016-05-06T22:25:50Z
 github.com/golang/groupcache	git	604ed5785183e59ae2789449d89e73f3a2a77987	2015-01-25T18:08:32Z
+github.com/gorilla/handlers	git	a24b39a6a2c8a7af2fe664dd4573205c99904035	2015-04-12T18:40:04Z
 github.com/gorilla/schema	git	08023a0215e7fc27a9aecd8b8c50913c40019478	2016-04-26T23:15:12Z
 github.com/gorilla/websocket	git	13e4d0621caa4d77fd9aa470ef6d7ab63d1a5e41	2015-09-23T22:29:30Z
 github.com/juju/bundlechanges	git	8d99dd2a94d7b4fd975a152238d0e19d0c4a6cf1	2016-06-15T07:19:43Z