|
@@ -8,8 +8,8 @@ import (
|
|
"strings"
|
|
"strings"
|
|
"sync"
|
|
"sync"
|
|
"time"
|
|
"time"
|
|
- uc "ucbsutil"
|
|
|
|
- ca "ucbsutil/cassandra"
|
|
|
|
|
|
+ //uc "ucbsutil"
|
|
|
|
+ //ca "ucbsutil/cassandra"
|
|
. "utils"
|
|
. "utils"
|
|
|
|
|
|
"github.com/gorilla/mux"
|
|
"github.com/gorilla/mux"
|
|
@@ -56,15 +56,15 @@ func Middleware(next http.Handler) http.Handler {
|
|
//定时保存日志
|
|
//定时保存日志
|
|
func SaveLogTask() {
|
|
func SaveLogTask() {
|
|
lock.Lock()
|
|
lock.Lock()
|
|
- /*if len(arr) >= 1 {
|
|
|
|
|
|
+ if len(arr) >= 1 {
|
|
tmp := arr
|
|
tmp := arr
|
|
arr = make([]map[string]interface{}, 0)
|
|
arr = make([]map[string]interface{}, 0)
|
|
go func() {
|
|
go func() {
|
|
log.Debug("timer..save..visit..log", len(tmp))
|
|
log.Debug("timer..save..visit..log", len(tmp))
|
|
Mgo.SaveBulk("logs", tmp...)
|
|
Mgo.SaveBulk("logs", tmp...)
|
|
}()
|
|
}()
|
|
- }*/
|
|
|
|
- if len(arr) >= 1 {
|
|
|
|
|
|
+ }
|
|
|
|
+ /*if len(arr) >= 1 {
|
|
tmp := arr
|
|
tmp := arr
|
|
arr = make([]map[string]interface{}, 0)
|
|
arr = make([]map[string]interface{}, 0)
|
|
go func() {
|
|
go func() {
|
|
@@ -73,7 +73,7 @@ func SaveLogTask() {
|
|
log.Println("timer..save..log", len(tmp))
|
|
log.Println("timer..save..log", len(tmp))
|
|
}
|
|
}
|
|
}()
|
|
}()
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
lock.Unlock()
|
|
lock.Unlock()
|
|
time.AfterFunc(2*time.Minute, SaveLogTask)
|
|
time.AfterFunc(2*time.Minute, SaveLogTask)
|
|
}
|
|
}
|
|
@@ -104,9 +104,9 @@ func addLog(req *http.Request) {
|
|
md, _ := json.Marshal(m)
|
|
md, _ := json.Marshal(m)
|
|
str := string(md)
|
|
str := string(md)
|
|
logs := map[string]interface{}{
|
|
logs := map[string]interface{}{
|
|
- "id": uc.DayShortTime(),
|
|
|
|
|
|
+ //"id": uc.DayShortTime(),
|
|
"date": timeNow,
|
|
"date": timeNow,
|
|
- "ip": req.Proto,
|
|
|
|
|
|
+ "ip": GetIp(req),
|
|
"refer": ref,
|
|
"refer": ref,
|
|
"year": timeNow.Year(),
|
|
"year": timeNow.Year(),
|
|
"month": timeNow.Month(),
|
|
"month": timeNow.Month(),
|
|
@@ -121,20 +121,21 @@ func addLog(req *http.Request) {
|
|
lock.Lock()
|
|
lock.Lock()
|
|
arr = append(arr, logs)
|
|
arr = append(arr, logs)
|
|
if len(arr) >= nc || s_url == "/sl" {
|
|
if len(arr) >= nc || s_url == "/sl" {
|
|
- /*tmp := arr
|
|
|
|
|
|
+ tmp := arr
|
|
arr = make([]map[string]interface{}, 0)
|
|
arr = make([]map[string]interface{}, 0)
|
|
go func() {
|
|
go func() {
|
|
log.Println("save..visit..log", len(tmp))
|
|
log.Println("save..visit..log", len(tmp))
|
|
Mgo.SaveBulk("logs", tmp...)
|
|
Mgo.SaveBulk("logs", tmp...)
|
|
- }()*/
|
|
|
|
- tmp := arr
|
|
|
|
- arr = make([]map[string]interface{}, 0)
|
|
|
|
- go func() {
|
|
|
|
- success := ca.SaveBatch("jy_qyfw", tmp)
|
|
|
|
- if success {
|
|
|
|
- log.Println("save..visit..log", len(tmp))
|
|
|
|
- }
|
|
|
|
}()
|
|
}()
|
|
|
|
+ /*
|
|
|
|
+ tmp := arr
|
|
|
|
+ arr = make([]map[string]interface{}, 0)
|
|
|
|
+ go func() {
|
|
|
|
+ success := ca.SaveBatch("jy_qyfw", tmp)
|
|
|
|
+ if success {
|
|
|
|
+ log.Println("save..visit..log", len(tmp))
|
|
|
|
+ }
|
|
|
|
+ }()*/
|
|
}
|
|
}
|
|
lock.Unlock()
|
|
lock.Unlock()
|
|
}
|
|
}
|