未验证 提交 2e19c8cd 编写于 作者: E Eolink 提交者: GitHub

Merge pull request #32 from Dot-Liu/master

修改初始化sql
...@@ -3,12 +3,14 @@ package application ...@@ -3,12 +3,14 @@ package application
import ( import (
"bytes" "bytes"
"errors" "errors"
"github.com/eolinker/goku-api-gateway/diting"
goku_labels "github.com/eolinker/goku-api-gateway/goku-labels"
"github.com/eolinker/goku-api-gateway/node/monitor"
"io" "io"
"net/http" "net/http"
"net/url" "net/url"
"github.com/eolinker/goku-api-gateway/diting"
goku_labels "github.com/eolinker/goku-api-gateway/goku-labels"
"github.com/eolinker/goku-api-gateway/node/monitor"
// "fmt" // "fmt"
"time" "time"
) )
...@@ -99,16 +101,16 @@ func (r *Request) Send() (*http.Response, error) { ...@@ -99,16 +101,16 @@ func (r *Request) Send() (*http.Response, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
start:=time.Now() start := time.Now()
defer func() { defer func() {
delay:= time.Since(start) delay := time.Since(start)
labels:= make(diting.Labels) labels := make(diting.Labels)
labels[goku_labels.Proto] = req.Proto labels[goku_labels.Proto] = req.Proto
labels[goku_labels.Host] = req.Host labels[goku_labels.Host] = req.Host
labels[goku_labels.Path] = req.URL.Path labels[goku_labels.Path] = req.URL.Path
labels[goku_labels.Method] = req.Method labels[goku_labels.Method] = req.Method
monitor.ProxyMonitor.Observe(float64( delay.Milliseconds()),labels) monitor.ProxyMonitor.Observe(float64(delay/time.Millisecond), labels)
}() }()
req.Header.Set("Accept-Encoding", "gzip") req.Header.Set("Accept-Encoding", "gzip")
req.Header = parseHeaders(r.headers) req.Header = parseHeaders(r.headers)
......
...@@ -2,13 +2,14 @@ package gateway ...@@ -2,13 +2,14 @@ package gateway
import ( import (
"fmt" "fmt"
"github.com/eolinker/goku-api-gateway/diting"
goku_labels "github.com/eolinker/goku-api-gateway/goku-labels"
"github.com/eolinker/goku-api-gateway/node/monitor"
"net/http" "net/http"
"strconv" "strconv"
"time" "time"
"github.com/eolinker/goku-api-gateway/diting"
goku_labels "github.com/eolinker/goku-api-gateway/goku-labels"
"github.com/eolinker/goku-api-gateway/node/monitor"
log "github.com/eolinker/goku-api-gateway/goku-log" log "github.com/eolinker/goku-api-gateway/goku-log"
access_log "github.com/eolinker/goku-api-gateway/goku-node/access-log" access_log "github.com/eolinker/goku-api-gateway/goku-node/access-log"
"github.com/eolinker/goku-api-gateway/goku-node/common" "github.com/eolinker/goku-api-gateway/goku-node/common"
...@@ -53,7 +54,7 @@ func (h *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { ...@@ -53,7 +54,7 @@ func (h *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
n, status := ctx.Finish() n, status := ctx.Finish()
delay:= time.Since(timeStart) delay := time.Since(timeStart)
ctx.LogFields[fields.RequestID] = requestID ctx.LogFields[fields.RequestID] = requestID
ctx.LogFields[fields.StatusCode] = status ctx.LogFields[fields.StatusCode] = status
...@@ -66,15 +67,12 @@ func (h *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { ...@@ -66,15 +67,12 @@ func (h *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
access_log.Log(ctx.LogFields) access_log.Log(ctx.LogFields)
log.WithFields(ctx.LogFields).Info() log.WithFields(ctx.LogFields).Info()
// 监控计数 // 监控计数
labels:= make(diting.Labels) labels := make(diting.Labels)
labels[goku_labels.API] = strconv.Itoa(ctx.ApiID()) labels[goku_labels.API] = strconv.Itoa(ctx.ApiID())
labels[goku_labels.Strategy] = ctx.StrategyId() labels[goku_labels.Strategy] = ctx.StrategyId()
labels[goku_labels.Status] = strconv.Itoa(status) labels[goku_labels.Status] = strconv.Itoa(status)
monitor.APIMonitor.Observe( float64( delay.Milliseconds()),labels) monitor.APIMonitor.Observe(float64(delay/time.Millisecond), labels)
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册