Merge pull request revel#1069 from revel/add-clientip-to-controller

jeevatkm · web-flow · commit cb9d72efbac8 · 2016-06-25T13:01:09.000-07:00
Added a client ip into controller instance
diff --git a/controller.go b/controller.go
@@ -26,6 +26,7 @@ type Controller struct {
 	MethodType    *MethodType     // A description of the invoked action type.
 	AppController interface{}     // The controller that was instantiated.
 	Action        string          // The fully qualified action name, e.g. "App.Index"
+	ClientIP      string          // holds IP address of request came from
 
 	Request  *Request
 	Response *Response
diff --git a/server.go b/server.go
@@ -51,13 +51,15 @@ func handleInternal(w http.ResponseWriter, r *http.Request, ws *websocket.Conn)
 	// TODO For now this okay to put logger here for all the requests
 	// However, it's best to have logging handler at server entry level
 	start := time.Now()
+	clientIP := ClientIP(r)
 
 	var (
 		req  = NewRequest(r)
 		resp = NewResponse(w)
 		c    = NewController(req, resp)
 	)
 	req.Websocket = ws
+	c.ClientIP = clientIP
 
 	Filters[0](c, Filters[1:])
 	if c.Result != nil {
@@ -76,7 +78,7 @@ func handleInternal(w http.ResponseWriter, r *http.Request, ws *websocket.Conn)
 	// 2016/05/25 17:46:37.112 127.0.0.1 200  270.157µs GET /
 	requestLog.Printf("%v %v %v %10v %v %v",
 		start.Format(requestLogTimeFormat),
-		ClientIP(r),
+		clientIP,
 		c.Response.Status,
 		time.Since(start),
 		r.Method,
