fix logging so that we always go out through log4go's global logger and we remove its default stdout appender

client/history.go

@@ -1,16 +1,16 @@
 package client
 
 import (
-        "time"
 	"container/list"
 	"net/http"
+	"time"
 )
 
 type RequestHistoryEntry struct {
-	req  *http.Request
-	resp *http.Response
-        start time.Time
-        duration time.Duration
+	req      *http.Request
+	resp     *http.Response
+	start    time.Time
+	duration time.Duration
 }
 
 type RequestHistory struct {
@@ -20,7 +20,7 @@ type RequestHistory struct {
 	resps      chan *http.Response
 	history    *list.List
 	onChange   func([]*RequestHistoryEntry)
-        metrics *ClientMetrics
+	metrics    *ClientMetrics
 }
 
 func NewRequestHistory(maxSize int, metrics *ClientMetrics, onChange func([]*RequestHistoryEntry)) *RequestHistory {
@@ -31,7 +31,7 @@ func NewRequestHistory(maxSize int, metrics *ClientMetrics, onChange func([]*Req
 		resps:      make(chan *http.Response),
 		history:    list.New(),
 		onChange:   onChange,
-                metrics:    metrics,
+		metrics:    metrics,
 	}
 
 	go func() {
@@ -50,7 +50,7 @@ func NewRequestHistory(maxSize int, metrics *ClientMetrics, onChange func([]*Req
 }
 
 func (rh *RequestHistory) addRequest(req *http.Request) {
-        rh.metrics.reqMeter.Mark(1)
+	rh.metrics.reqMeter.Mark(1)
 	if rh.history.Len() >= rh.maxSize {
 		entry := rh.history.Remove(rh.history.Back()).(*RequestHistoryEntry)
 		delete(rh.reqToEntry, entry.req)
@@ -64,8 +64,8 @@ func (rh *RequestHistory) addRequest(req *http.Request) {
 
 func (rh *RequestHistory) addResponse(resp *http.Response) {
 	if entry, ok := rh.reqToEntry[resp.Request]; ok {
-                entry.duration = time.Since(entry.start)
-                rh.metrics.reqTimer.Update(entry.duration)
+		entry.duration = time.Since(entry.start)
+		rh.metrics.reqTimer.Update(entry.duration)
 
 		entry.resp = resp
 		rh.onChange(rh.copy())

client/main.go

@@ -5,9 +5,9 @@ import (
 	"crypto/rand"
 	"fmt"
 	"net"
-	"ngrok"
 	"ngrok/client/ui"
 	"ngrok/conn"
+	nlog "ngrok/log"
 	"ngrok/proto"
 	"runtime"
 	"time"
@@ -26,7 +26,7 @@ func connect(addr string, typ string) (c conn.Conn, err error) {
 		return
 	}
 
-	//log.Debug("Dialing %v", addr)
+	log.Debug("Dialing %v", addr)
 	if tcpConn, err = net.DialTCP("tcp", nil, tcpAddr); err != nil {
 		return
 	}
@@ -86,9 +86,9 @@ func control(s *State) {
 	defer func() {
 		if r := recover(); r != nil {
 			log.Error("Recovering from failure %v, attempting to reconnect to server after 10 seconds . . .", r)
-			time.Sleep(10 * time.Second)
 			s.status = "reconnecting"
 			s.Update()
+			time.Sleep(10 * time.Second)
 			go control(s)
 		}
 	}()
@@ -155,14 +155,14 @@ func mkid() string {
 }
 
 func Main() {
-	ngrok.LogToFile()
-	//	ngrok.LogToConsole()
+	// XXX: should do this only if they ask us too
+	nlog.LogToFile()
 
 	// parse options
 	opts := parseArgs()
 
 	// init terminal, http UI
-	//termView := ui.NewTerm()
+	termView := ui.NewTerm()
 	httpView := ui.NewHttp(9999)
 
 	// init client state
@@ -171,8 +171,8 @@ func Main() {
 		id: mkid(),
 
 		// ui communication channels
-		//            ui: ui.NewUi(termView, httpView),
-		ui: ui.NewUi(httpView),
+		ui: ui.NewUi(termView, httpView),
+		//ui: ui.NewUi(httpView),
 
 		// command-line options
 		opts: opts,

client/metrics.go

@@ -14,9 +14,9 @@ type ClientMetrics struct {
 	connGauge       metrics.Gauge
 	connMeter       metrics.Meter
 	connTimer       metrics.Timer
-        reqGauge    metrics.Gauge
-        reqMeter    metrics.Meter
-        reqTimer    metrics.Timer
+	reqGauge        metrics.Gauge
+	reqMeter        metrics.Meter
+	reqTimer        metrics.Timer
 	proxySetupTimer metrics.Timer
 	bytesIn         metrics.Histogram
 	bytesOut        metrics.Histogram
@@ -29,9 +29,9 @@ func NewClientMetrics() *ClientMetrics {
 		connGauge:       metrics.NewGauge(),
 		connMeter:       metrics.NewMeter(),
 		connTimer:       metrics.NewTimer(),
-		reqGauge:       metrics.NewGauge(),
-		reqMeter:       metrics.NewMeter(),
-		reqTimer:       metrics.NewTimer(),
+		reqGauge:        metrics.NewGauge(),
+		reqMeter:        metrics.NewMeter(),
+		reqTimer:        metrics.NewTimer(),
 		proxySetupTimer: metrics.NewTimer(),
 		bytesIn:         metrics.NewHistogram(metrics.NewExpDecaySample(sampleSize, sampleAlpha)),
 		bytesOut:        metrics.NewHistogram(metrics.NewExpDecaySample(sampleSize, sampleAlpha)),

client/ui/http.go

@@ -127,12 +127,12 @@ func (h *Http) run() {
 			template.New("page.html").Funcs(funcMap).ParseFiles("./templates/page.html", "./templates/body.html"))
 
 		for _, htxn := range s.GetHistory() {
-                        req, resp := htxn.GetRequest(), htxn.GetResponse()
+			req, resp := htxn.GetRequest(), htxn.GetResponse()
 
 			req.Body = NewRepeatableReader(req.Body)
-                        if resp != nil && resp.Body != nil {
-                            resp.Body = NewRepeatableReader(resp.Body)
-                        }
+			if resp != nil && resp.Body != nil {
+				resp.Body = NewRepeatableReader(resp.Body)
+			}
 		}
 
 		// write the response

conn/conn.go

@@ -8,24 +8,24 @@ import (
 	"math/rand"
 	"net"
 	"net/http"
-	"ngrok"
+	"ngrok/log"
 )
 
 type Conn interface {
 	net.Conn
-	ngrok.Logger
+	log.Logger
 	Id() string
 }
 
 type tcpConn struct {
 	net.Conn
-	ngrok.Logger
+	log.Logger
 	id  int32
 	typ string
 }
 
 func NewTCP(conn net.Conn, typ string) *tcpConn {
-	c := &tcpConn{conn, ngrok.NewPrefixLogger(), rand.Int31(), typ}
+	c := &tcpConn{conn, log.NewPrefixLogger(), rand.Int31(), typ}
 	c.AddLogPrefix(c.Id())
 	c.Info("New connection from %v", conn.RemoteAddr())
 	return c

logger.go → log/logger.go

@@ -1,23 +1,26 @@
-package ngrok
+package log
 
 import (
 	log "code.google.com/p/log4go"
 	"fmt"
 )
 
-var Log log.Logger
+const (
+	logfile string = "ngrok.log"
+)
 
 func init() {
-	Log = make(log.Logger)
-	//    Log.AddFilter("log", log.DEBUG, log.NewFileLogWriter("ngrok.log", true))
+	// log4go automatically sets the global logger to write to stdout
+	// and we don't want that by default
+	delete(log.Global, "stdout")
 }
 
 func LogToConsole() {
-	Log.AddFilter("log", log.DEBUG, log.NewConsoleLogWriter())
+	log.Global.AddFilter("log", log.DEBUG, log.NewConsoleLogWriter())
 }
 
 func LogToFile() {
-	Log.AddFilter("log", log.DEBUG, log.NewFileLogWriter("ngrok.log", true))
+	log.Global.AddFilter("log", log.DEBUG, log.NewFileLogWriter(logfile, true))
 }
 
 type Logger interface {
@@ -29,11 +32,12 @@ type Logger interface {
 }
 
 type PrefixLogger struct {
+	*log.Logger
 	prefix string
 }
 
 func NewPrefixLogger() Logger {
-	return &PrefixLogger{}
+	return &PrefixLogger{Logger: &log.Global}
 }
 
 func (pl *PrefixLogger) pfx(fmtstr string) interface{} {
@@ -41,19 +45,19 @@ func (pl *PrefixLogger) pfx(fmtstr string) interface{} {
 }
 
 func (pl *PrefixLogger) Debug(arg0 string, args ...interface{}) {
-	Log.Debug(pl.pfx(arg0), args...)
+	pl.Logger.Debug(pl.pfx(arg0), args...)
 }
 
 func (pl *PrefixLogger) Info(arg0 string, args ...interface{}) {
-	Log.Info(pl.pfx(arg0), args...)
+	pl.Logger.Info(pl.pfx(arg0), args...)
 }
 
 func (pl *PrefixLogger) Warn(arg0 string, args ...interface{}) error {
-	return Log.Warn(pl.pfx(arg0), args...)
+	return pl.Logger.Warn(pl.pfx(arg0), args...)
 }
 
 func (pl *PrefixLogger) Error(arg0 string, args ...interface{}) error {
-	return Log.Error(pl.pfx(arg0), args...)
+	return pl.Logger.Error(pl.pfx(arg0), args...)
 }
 
 func (pl *PrefixLogger) AddLogPrefix(prefix string) {

server/http.go

@@ -56,7 +56,7 @@ func httpHandler(tcpConn net.Conn) {
 
 	if tunnel == nil {
 		conn.Info("Not tunnel found for hostname %s", req.Host)
-                return
+		return
 	}
 
 	tunnel.HandlePublicConnection(conn)

server/main.go

@@ -3,10 +3,10 @@ package server
 import (
 	log "code.google.com/p/log4go"
 	"flag"
-        "fmt"
+	"fmt"
 	"net"
-	"ngrok"
 	"ngrok/conn"
+	nlog "ngrok/log"
 	"ngrok/proto"
 	"regexp"
 )
@@ -117,7 +117,7 @@ func proxyListener(addr *net.TCPAddr, domain string) {
 }
 
 func Main() {
-	ngrok.LogToConsole()
+	nlog.LogToConsole()
 	done := make(chan int)
 	// parse options
 	opts := parseArgs()

server/tunnel.go

@@ -3,8 +3,8 @@ package server
 import (
 	"fmt"
 	"net"
-	"ngrok"
 	"ngrok/conn"
+	"ngrok/log"
 	"ngrok/proto"
 )
 
@@ -28,7 +28,7 @@ type Tunnel struct {
 	proxies chan conn.Conn
 
 	// logger
-	ngrok.Logger
+	log.Logger
 }
 
 func newTunnel(msg *proto.RegMsg, ctl *Control) {
@@ -36,7 +36,7 @@ func newTunnel(msg *proto.RegMsg, ctl *Control) {
 		regMsg:  msg,
 		ctl:     ctl,
 		proxies: make(chan conn.Conn),
-		Logger:  ngrok.NewPrefixLogger(),
+		Logger:  log.NewPrefixLogger(),
 	}
 
 	switch t.regMsg.Protocol {