Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Xiaomi
soar
提交
1bdc431a
S
soar
项目概览
Xiaomi
/
soar
大约 1 年 前同步成功
通知
388
Star
8512
Fork
1328
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
soar
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1bdc431a
编写于
12月 05, 2018
作者:
martianzhang
提交者:
GitHub
12月 05, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #149 from xiyangxixian/master
fix SetLooger && update filepath
上级
c64c6a7d
c4a9af29
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
17 deletion
+22
-17
common/config.go
common/config.go
+11
-16
common/logger.go
common/logger.go
+11
-1
未找到文件。
common/config.go
浏览文件 @
1bdc431a
...
...
@@ -25,6 +25,7 @@ import (
"io"
"io/ioutil"
"os"
"path/filepath"
"regexp"
"runtime"
"strings"
...
...
@@ -591,21 +592,14 @@ func readCmdFlags() error {
Config
.
SamplingStatisticTarget
=
*
samplingStatisticTarget
Config
.
ConnTimeOut
=
*
connTimeOut
Config
.
QueryTimeOut
=
*
queryTimeOut
Config
.
LogLevel
=
*
logLevel
if
strings
.
HasPrefix
(
*
logOutput
,
"/"
)
{
if
filepath
.
IsAbs
(
*
logOutput
)
||
*
logOutput
==
""
{
Config
.
LogOutput
=
*
logOutput
}
else
{
if
BaseDir
==
""
{
Config
.
LogOutput
=
*
logOutput
}
else
{
if
runtime
.
GOOS
==
"windows"
{
Config
.
LogOutput
=
*
logOutput
}
else
{
Config
.
LogOutput
=
BaseDir
+
"/"
+
*
logOutput
}
}
Config
.
LogOutput
=
filepath
.
Join
(
BaseDir
,
*
logOutput
)
}
Config
.
ReportType
=
strings
.
ToLower
(
*
reportType
)
Config
.
ReportCSS
=
*
reportCSS
Config
.
ReportJavascript
=
*
reportJavascript
...
...
@@ -615,12 +609,13 @@ func readCmdFlags() error {
Config
.
IgnoreRules
=
strings
.
Split
(
*
ignoreRules
,
","
)
Config
.
RewriteRules
=
strings
.
Split
(
*
rewriteRules
,
","
)
*
blackList
=
strings
.
TrimSpace
(
*
blackList
)
if
strings
.
HasPrefix
(
*
blackList
,
"/"
)
||
*
blackList
==
""
{
if
filepath
.
IsAbs
(
*
blackList
)
||
*
blackList
==
""
{
Config
.
BlackList
=
*
blackList
}
else
{
pwd
,
_
:=
os
.
Getwd
()
Config
.
BlackList
=
pwd
+
"/"
+
*
blackList
Config
.
BlackList
=
filepath
.
Join
(
BaseDir
,
*
blackList
)
}
Config
.
MaxJoinTableCount
=
*
maxJoinTableCount
Config
.
MaxGroupByColsCount
=
*
maxGroupByColsCount
Config
.
MaxDistinctCount
=
*
maxDistinctCount
...
...
@@ -697,8 +692,8 @@ func ParseConfig(configFile string) error {
if
configFile
==
""
{
configs
=
[]
string
{
"/etc/soar.yaml"
,
BaseDir
+
"/etc/soar.yaml"
,
BaseDir
+
"/soar.yaml"
,
filepath
.
Join
(
BaseDir
,
"etc"
,
"soar.yaml"
)
,
filepath
.
Join
(
BaseDir
,
"soar.yaml"
)
,
}
}
else
{
configs
=
[]
string
{
...
...
common/logger.go
浏览文件 @
1bdc431a
...
...
@@ -17,6 +17,7 @@
package
common
import
(
"encoding/json"
"fmt"
"regexp"
"runtime"
...
...
@@ -40,7 +41,16 @@ func init() {
func
LoggerInit
()
{
Log
.
SetLevel
(
Config
.
LogLevel
)
func
()
{
_
=
Log
.
DelLogger
(
logs
.
AdapterFile
)
}()
err
:=
Log
.
SetLogger
(
logs
.
AdapterFile
,
fmt
.
Sprintf
(
`{"filename":"%s","level":7,"maxlines":0,"maxsize":0,"daily":false,"maxdays":0}`
,
Config
.
LogOutput
))
logConfig
:=
map
[
string
]
interface
{}{
"filename"
:
Config
.
LogOutput
,
"level"
:
7
,
"maxlines"
:
0
,
"maxsize"
:
0
,
"daily"
:
false
,
"maxdays"
:
0
,
}
logConfigJson
,
_
:=
json
.
Marshal
(
logConfig
)
err
:=
Log
.
SetLogger
(
logs
.
AdapterFile
,
fmt
.
Sprintf
(
string
(
logConfigJson
)))
if
err
!=
nil
{
fmt
.
Println
(
err
.
Error
())
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录