Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
search_server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
87b49891
authored
Oct 28, 2020
by
huangchengyi
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
1.0
parent
925873b3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
30 deletions
boot/app.go
pkg/common/log_report.go
pkg/common/response.go
pkg/logger/logger.go
boot/app.go
View file @
87b49891
...
@@ -3,6 +3,7 @@ package boot
...
@@ -3,6 +3,7 @@ package boot
import
(
import
(
"search_server/pkg/config"
"search_server/pkg/config"
"search_server/pkg/gredis"
"search_server/pkg/gredis"
"search_server/pkg/logger"
"search_server/pkg/mongo"
"search_server/pkg/mongo"
"search_server/pkg/mysql"
"search_server/pkg/mysql"
)
)
...
@@ -23,9 +24,9 @@ func Boot(configPath string) (err error) {
...
@@ -23,9 +24,9 @@ func Boot(configPath string) (err error) {
panic
(
err
)
panic
(
err
)
return
return
}
}
//
if err = logger.SetUp(); err != nil {
if
err
=
logger
.
SetUp
();
err
!=
nil
{
//
panic(err)
panic
(
err
)
//
return
return
//
}
}
return
return
}
}
pkg/common/log_report.go
View file @
87b49891
...
@@ -4,9 +4,6 @@ import (
...
@@ -4,9 +4,6 @@ import (
"encoding/json"
"encoding/json"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin"
"github.com/gomodule/redigo/redis"
"github.com/gomodule/redigo/redis"
"github.com/ichunt2019/logger"
log
"github.com/sirupsen/logrus"
"os"
"search_server/pkg/config"
"search_server/pkg/config"
"search_server/pkg/gredis"
"search_server/pkg/gredis"
"search_server/pkg/message"
"search_server/pkg/message"
...
@@ -61,10 +58,7 @@ func AnalyzeSearchError(ctx *gin.Context,code int, ip, errMsg, file, line, metho
...
@@ -61,10 +58,7 @@ func AnalyzeSearchError(ctx *gin.Context,code int, ip, errMsg, file, line, metho
redisCon
:=
gredis
.
Conn
(
"search_w"
)
redisCon
:=
gredis
.
Conn
(
"search_w"
)
defer
redisCon
.
Close
()
defer
redisCon
.
Close
()
key
:=
config
.
Get
(
"SEARCH_API_LOG.SEARCH_API_ERROR_PRE"
)
.
String
()
+
unitSupplierLogCode
[
codeStr
]
key
:=
config
.
Get
(
"SEARCH_API_LOG.SEARCH_API_ERROR_PRE"
)
.
String
()
+
unitSupplierLogCode
[
codeStr
]
_
,
err
:=
redis
.
Bool
(
redisCon
.
Do
(
"INCR"
,
key
))
redis
.
Bool
(
redisCon
.
Do
(
"INCR"
,
key
))
if
err
!=
nil
{
logger
.
Error
(
"%s"
,
err
)
}
}
}
return
return
}
}
...
@@ -72,21 +66,9 @@ func AnalyzeSearchError(ctx *gin.Context,code int, ip, errMsg, file, line, metho
...
@@ -72,21 +66,9 @@ func AnalyzeSearchError(ctx *gin.Context,code int, ip, errMsg, file, line, metho
type
LogFormatter
struct
{}
type
LogFormatter
struct
{}
//格式详情
//格式详情
func
(
s
*
LogFormatter
)
Format
(
entry
*
log
.
Entry
)
([]
byte
,
error
)
{
//func (s *LogFormatter) Format(entry *log.Entry) ([]byte, error) {
msg
:=
entry
.
Message
+
"
\n
"
// msg := entry.Message + "\n"
return
[]
byte
(
msg
),
nil
// return []byte(msg), nil
}
//}
//写入到特定的文件夹给ELK使用的日志
func
WriteSearchErrorLog
(
searchLog
string
)
{
return
;
// 设置日志格式为json格式
log
.
SetFormatter
(
new
(
LogFormatter
))
path
:=
"../logs/search/"
//设置output,默认为stderr,可以为任何io.Writer,比如文件*os.File
//生成当天的日志
filePath
:=
path
+
time
.
Now
()
.
Format
(
"20060102"
)
+
".log"
file
,
_
:=
os
.
OpenFile
(
filePath
,
os
.
O_CREATE
|
os
.
O_WRONLY
|
os
.
O_APPEND
,
0666
)
log
.
SetOutput
(
file
)
log
.
Error
(
searchLog
)
}
pkg/common/response.go
View file @
87b49891
...
@@ -4,6 +4,7 @@ import (
...
@@ -4,6 +4,7 @@ import (
"encoding/json"
"encoding/json"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin"
"runtime"
"runtime"
"search_server/pkg/logger"
"strconv"
"strconv"
)
)
...
@@ -87,5 +88,5 @@ func SearchApiLogger(ctx *gin.Context,code int, msg string) {
...
@@ -87,5 +88,5 @@ func SearchApiLogger(ctx *gin.Context,code int, msg string) {
lineNo
:=
strconv
.
Itoa
(
line
)
lineNo
:=
strconv
.
Itoa
(
line
)
searchLog
:=
AnalyzeSearchError
(
ctx
,
code
,
ctx
.
ClientIP
(),
errMsg
,
file
,
lineNo
,
f
.
Name
())
searchLog
:=
AnalyzeSearchError
(
ctx
,
code
,
ctx
.
ClientIP
(),
errMsg
,
file
,
lineNo
,
f
.
Name
())
searchLogByte
,
_
:=
json
.
Marshal
(
searchLog
)
searchLogByte
,
_
:=
json
.
Marshal
(
searchLog
)
WriteSearchErrorLog
(
string
(
searchLogByte
)
)
logger
.
Log
(
string
(
searchLogByte
),
"elk"
)
}
}
pkg/logger/logger.go
View file @
87b49891
...
@@ -7,7 +7,7 @@ import (
...
@@ -7,7 +7,7 @@ import (
func
SetUp
()
(
err
error
)
{
func
SetUp
()
(
err
error
)
{
logConfig
:=
make
(
map
[
string
]
string
)
logConfig
:=
make
(
map
[
string
]
string
)
logConfig
[
"log_path"
]
=
"logs"
logConfig
[
"log_path"
]
=
"logs"
logConfig
[
"log_chan_size"
]
=
"5
000
"
logConfig
[
"log_chan_size"
]
=
"5"
err
=
logger
.
InitLogger
(
"file"
,
logConfig
)
err
=
logger
.
InitLogger
(
"file"
,
logConfig
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment