[proxy]请求、日志增加若干个变量

Author: iwind

tealogs/accesslogs/README.md

@@ -0,0 +1,3 @@
+~~~bash
+easyjson -all access_log.go
+~~~

tealogs/accesslogs/access_log.go

@@ -34,7 +34,8 @@ type AccessLog struct {
 	RewriteId  string `var:"rewriteId" bson:"rewriteId" json:"rewriteId"`    // 重写规则ID
 
 	TeaVersion      string  `var:"teaVersion" bson:"teaVersion" json:"teaVersion"`                // TeaWeb版本
-	RemoteAddr      string  `var:"remoteAddr" bson:"remoteAddr" json:"remoteAddr"`                // 终端地址，通常是：ip:port
+	RemoteAddr      string  `var:"remoteAddr" bson:"remoteAddr" json:"remoteAddr"`                // 终端地址
+	RawRemoteAddr   string  `var:"rawRemoteAddr" bson:"rawRemoteAddr" json:"rawRemoteAddr"`       // 直接连接服务器的终端地址
 	RemotePort      int     `var:"remotePort" bson:"remotePort" json:"remotePort"`                // 终端端口
 	RemoteUser      string  `var:"remoteUser" bson:"remoteUser" json:"remoteUser"`                // 终端用户，基于BasicAuth认证
 	RequestURI      string  `var:"requestURI" bson:"requestURI" json:"requestURI"`                // 请求URI
@@ -71,9 +72,12 @@ type AccessLog struct {
 	ServerName     string              `var:"serverName" bson:"serverName" json:"serverName"`             // 接收请求的服务器名
 	ServerPort     int                 `var:"serverPort" bson:"serverPort" json:"serverPort"`             // 服务器端口
 	ServerProtocol string              `var:"serverProtocol" bson:"serverProtocol" json:"serverProtocol"` // 服务器协议，类似于HTTP/1.0”
+	Hostname       string              `var:"hostname" bson:"hostname" json:"hostname"`
 
 	// 代理相关
 	BackendAddress string `var:"backendAddress" bson:"backendAddress" json:"backendAddress"` // 代理的后端的地址
+	BackendCode    string `var:"backendCode" bson:"backendCode" json:"backendCode"`          // 后端代号
+	BackendScheme  string `var:"backendScheme" bson:"backendScheme" json:"backendScheme"`    // 后端协议
 	FastcgiAddress string `var:"fastcgiAddress" bson:"fastcgiAddress" json:"fastcgiAddress"` // Fastcgi后端地址
 
 	// 调试用
@@ -269,6 +273,28 @@ func (this *AccessLog) Format(format string) string {
 			}
 		}
 
+		// backend
+		if strings.HasPrefix(varName, "backend.") {
+			subVarName := varName[8:]
+			switch subVarName {
+			case "id":
+				return this.BackendId
+			case "address":
+				return this.BackendAddress
+			case "host":
+				index := strings.Index(this.BackendAddress, ":")
+				if index > -1 {
+					return this.BackendAddress[:index]
+				} else {
+					return ""
+				}
+			case "scheme":
+				return this.BackendScheme
+			case "code":
+				return this.BackendCode
+			}
+		}
+
 		return "${" + varName + "}"
 	})
 

tealogs/accesslogs/access_log_easyjson.go

@@ -331,6 +331,21 @@ func TestAccessLog_JSON(t *testing.T) {
 	t.Log(string(data))
 }
 
+func TestAccessLog_Backend(t *testing.T) {
+	accessLog := NewAccessLog()
+	accessLog.BackendId = "1234"
+	accessLog.BackendAddress = "127.0.0.1:8001"
+	accessLog.BackendCode = "web001"
+	accessLog.BackendScheme = "http"
+	accessLog.Hostname = "Web001"
+	t.Log(accessLog.Format("${backend.address} ${backend.host} ${backend.id} ${backend.code} ${backend.scheme} ${hostname}"))
+	data, err := easyjson.Marshal(accessLog)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(string(data))
+}
+
 func TestAccessLog_JSON_compare(t *testing.T) {
 	accessLog := &AccessLog{
 		RequestPath:     "/hello",

tealogs/accesslogs/access_log_test.go

@@ -54,6 +54,9 @@ var bytePool1k = teautils.NewBytePool(20480, 1024)
 var bytePool32k = teautils.NewBytePool(20480, 32*1024)
 var bytePool128k = teautils.NewBytePool(20480, 128*1024)
 
+// 环境变量
+var HOSTNAME, _ = os.Hostname()
+
 // 请求定义
 // HTTP HEADER RFC: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
 type Request struct {
@@ -1270,6 +1273,8 @@ func (this *Request) Format(source string) string {
 			return this.serverName
 		case "serverPort":
 			return strconv.Itoa(this.requestServerPort())
+		case "hostname":
+			return HOSTNAME
 		case "documentRoot":
 			if this.locationContext != nil && len(this.locationContext.Root) > 0 {
 				return this.locationContext.Root
@@ -1305,6 +1310,13 @@ func (this *Request) Format(source string) string {
 				switch suffix {
 				case "address":
 					return this.backend.Address
+				case "host":
+					index := strings.Index(this.backend.Address, ":")
+					if index > -1 {
+						return this.backend.Address[:index]
+					} else {
+						return ""
+					}
 				case "id":
 					return this.backend.Id
 				case "scheme":
@@ -1432,9 +1444,16 @@ func (this *Request) log() {
 		cookies[cookie.Name] = cookie.Value
 	}
 
+	addr := this.raw.RemoteAddr
+	host, _, err := net.SplitHostPort(addr)
+	if err == nil {
+		addr = host
+	}
+
 	accessLog := &accesslogs.AccessLog{
 		TeaVersion:      teaconst.TeaVersion,
 		RemoteAddr:      this.requestRemoteAddr(),
+		RawRemoteAddr:   addr,
 		RemotePort:      this.requestRemotePort(),
 		RemoteUser:      this.requestRemoteUser(),
 		RequestURI:      this.requestURI(),
@@ -1469,6 +1488,7 @@ func (this *Request) log() {
 		HasErrors:       len(this.errors) > 0,
 		Extend:          &accesslogs.AccessLogExtend{},
 		Attrs:           this.attrs,
+		Hostname:        HOSTNAME,
 	}
 
 	// 日志和统计
@@ -1501,6 +1521,8 @@ func (this *Request) log() {
 	if this.backend != nil {
 		accessLog.BackendAddress = this.backend.Address
 		accessLog.BackendId = this.backend.Id
+		accessLog.BackendScheme = this.backend.Scheme
+		accessLog.BackendCode = this.backend.Code
 	}
 
 	if this.fastcgi != nil {

teaproxy/request.go

@@ -28,7 +28,7 @@ func (this *CCCheckpoint) Start() {
 	if this.grid != nil {
 		this.grid.Destroy()
 	}
-	this.grid = teamemory.NewGrid(100)
+	this.grid = teamemory.NewGrid(32)
 }
 
 func (this *CCCheckpoint) RequestValue(req *requests.Request, param string, options map[string]string) (value interface{}, sysErr error, userErr error) {