Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
企猫商务
frp
提交
388b0168
F
frp
项目概览
企猫商务
/
frp
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
frp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
388b0168
编写于
8月 12, 2019
作者:
F
fatedier
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support disable_log_color for console mode
上级
50796643
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
69 addition
and
25 deletion
+69
-25
cmd/frpc/main.go
cmd/frpc/main.go
+4
-0
cmd/frpc/sub/http.go
cmd/frpc/sub/http.go
+1
-0
cmd/frpc/sub/https.go
cmd/frpc/sub/https.go
+1
-0
cmd/frpc/sub/root.go
cmd/frpc/sub/root.go
+12
-8
cmd/frpc/sub/stcp.go
cmd/frpc/sub/stcp.go
+1
-0
cmd/frpc/sub/tcp.go
cmd/frpc/sub/tcp.go
+1
-0
cmd/frpc/sub/udp.go
cmd/frpc/sub/udp.go
+1
-0
cmd/frpc/sub/xtcp.go
cmd/frpc/sub/xtcp.go
+1
-0
cmd/frps/main.go
cmd/frps/main.go
+4
-0
cmd/frps/root.go
cmd/frps/root.go
+5
-1
conf/frpc_full.ini
conf/frpc_full.ini
+3
-0
conf/frps_full.ini
conf/frps_full.ini
+3
-0
models/config/client_common.go
models/config/client_common.go
+6
-0
models/config/server_common.go
models/config/server_common.go
+18
-12
utils/log/log.go
utils/log/log.go
+8
-4
未找到文件。
cmd/frpc/main.go
浏览文件 @
388b0168
...
...
@@ -15,6 +15,9 @@
package
main
import
(
"math/rand"
"time"
_
"github.com/fatedier/frp/assets/frpc/statik"
"github.com/fatedier/frp/cmd/frpc/sub"
...
...
@@ -23,6 +26,7 @@ import (
func
main
()
{
crypto
.
DefaultSalt
=
"frp"
rand
.
Seed
(
time
.
Now
()
.
UnixNano
())
sub
.
Execute
()
}
cmd/frpc/sub/http.go
浏览文件 @
388b0168
...
...
@@ -33,6 +33,7 @@ func init() {
httpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logLevel
,
"log_level"
,
""
,
"info"
,
"log level"
)
httpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logFile
,
"log_file"
,
""
,
"console"
,
"console or file path"
)
httpCmd
.
PersistentFlags
()
.
IntVarP
(
&
logMaxDays
,
"log_max_days"
,
""
,
3
,
"log file reversed days"
)
httpCmd
.
PersistentFlags
()
.
BoolVarP
(
&
disableLogColor
,
"disable_log_color"
,
""
,
false
,
"disable log color in console"
)
httpCmd
.
PersistentFlags
()
.
StringVarP
(
&
proxyName
,
"proxy_name"
,
"n"
,
""
,
"proxy name"
)
httpCmd
.
PersistentFlags
()
.
StringVarP
(
&
localIp
,
"local_ip"
,
"i"
,
"127.0.0.1"
,
"local ip"
)
...
...
cmd/frpc/sub/https.go
浏览文件 @
388b0168
...
...
@@ -33,6 +33,7 @@ func init() {
httpsCmd
.
PersistentFlags
()
.
StringVarP
(
&
logLevel
,
"log_level"
,
""
,
"info"
,
"log level"
)
httpsCmd
.
PersistentFlags
()
.
StringVarP
(
&
logFile
,
"log_file"
,
""
,
"console"
,
"console or file path"
)
httpsCmd
.
PersistentFlags
()
.
IntVarP
(
&
logMaxDays
,
"log_max_days"
,
""
,
3
,
"log file reversed days"
)
httpsCmd
.
PersistentFlags
()
.
BoolVarP
(
&
disableLogColor
,
"disable_log_color"
,
""
,
false
,
"disable log color in console"
)
httpsCmd
.
PersistentFlags
()
.
StringVarP
(
&
proxyName
,
"proxy_name"
,
"n"
,
""
,
"proxy name"
)
httpsCmd
.
PersistentFlags
()
.
StringVarP
(
&
localIp
,
"local_ip"
,
"i"
,
"127.0.0.1"
,
"local ip"
)
...
...
cmd/frpc/sub/root.go
浏览文件 @
388b0168
...
...
@@ -43,13 +43,14 @@ var (
cfgFile
string
showVersion
bool
serverAddr
string
user
string
protocol
string
token
string
logLevel
string
logFile
string
logMaxDays
int
serverAddr
string
user
string
protocol
string
token
string
logLevel
string
logFile
string
logMaxDays
int
disableLogColor
bool
proxyName
string
localIp
string
...
...
@@ -165,6 +166,7 @@ func parseClientCommonCfgFromCmd() (err error) {
}
else
{
g
.
GlbClientCfg
.
LogWay
=
"file"
}
g
.
GlbClientCfg
.
DisableLogColor
=
disableLogColor
return
nil
}
...
...
@@ -191,7 +193,9 @@ func runClient(cfgFilePath string) (err error) {
}
func
startService
(
pxyCfgs
map
[
string
]
config
.
ProxyConf
,
visitorCfgs
map
[
string
]
config
.
VisitorConf
)
(
err
error
)
{
log
.
InitLog
(
g
.
GlbClientCfg
.
LogWay
,
g
.
GlbClientCfg
.
LogFile
,
g
.
GlbClientCfg
.
LogLevel
,
g
.
GlbClientCfg
.
LogMaxDays
)
log
.
InitLog
(
g
.
GlbClientCfg
.
LogWay
,
g
.
GlbClientCfg
.
LogFile
,
g
.
GlbClientCfg
.
LogLevel
,
g
.
GlbClientCfg
.
LogMaxDays
,
g
.
GlbClientCfg
.
DisableLogColor
)
if
g
.
GlbClientCfg
.
DnsServer
!=
""
{
s
:=
g
.
GlbClientCfg
.
DnsServer
if
!
strings
.
Contains
(
s
,
":"
)
{
...
...
cmd/frpc/sub/stcp.go
浏览文件 @
388b0168
...
...
@@ -32,6 +32,7 @@ func init() {
stcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logLevel
,
"log_level"
,
""
,
"info"
,
"log level"
)
stcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logFile
,
"log_file"
,
""
,
"console"
,
"console or file path"
)
stcpCmd
.
PersistentFlags
()
.
IntVarP
(
&
logMaxDays
,
"log_max_days"
,
""
,
3
,
"log file reversed days"
)
stcpCmd
.
PersistentFlags
()
.
BoolVarP
(
&
disableLogColor
,
"disable_log_color"
,
""
,
false
,
"disable log color in console"
)
stcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
proxyName
,
"proxy_name"
,
"n"
,
""
,
"proxy name"
)
stcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
role
,
"role"
,
""
,
"server"
,
"role"
)
...
...
cmd/frpc/sub/tcp.go
浏览文件 @
388b0168
...
...
@@ -32,6 +32,7 @@ func init() {
tcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logLevel
,
"log_level"
,
""
,
"info"
,
"log level"
)
tcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logFile
,
"log_file"
,
""
,
"console"
,
"console or file path"
)
tcpCmd
.
PersistentFlags
()
.
IntVarP
(
&
logMaxDays
,
"log_max_days"
,
""
,
3
,
"log file reversed days"
)
tcpCmd
.
PersistentFlags
()
.
BoolVarP
(
&
disableLogColor
,
"disable_log_color"
,
""
,
false
,
"disable log color in console"
)
tcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
proxyName
,
"proxy_name"
,
"n"
,
""
,
"proxy name"
)
tcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
localIp
,
"local_ip"
,
"i"
,
"127.0.0.1"
,
"local ip"
)
...
...
cmd/frpc/sub/udp.go
浏览文件 @
388b0168
...
...
@@ -32,6 +32,7 @@ func init() {
udpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logLevel
,
"log_level"
,
""
,
"info"
,
"log level"
)
udpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logFile
,
"log_file"
,
""
,
"console"
,
"console or file path"
)
udpCmd
.
PersistentFlags
()
.
IntVarP
(
&
logMaxDays
,
"log_max_days"
,
""
,
3
,
"log file reversed days"
)
udpCmd
.
PersistentFlags
()
.
BoolVarP
(
&
disableLogColor
,
"disable_log_color"
,
""
,
false
,
"disable log color in console"
)
udpCmd
.
PersistentFlags
()
.
StringVarP
(
&
proxyName
,
"proxy_name"
,
"n"
,
""
,
"proxy name"
)
udpCmd
.
PersistentFlags
()
.
StringVarP
(
&
localIp
,
"local_ip"
,
"i"
,
"127.0.0.1"
,
"local ip"
)
...
...
cmd/frpc/sub/xtcp.go
浏览文件 @
388b0168
...
...
@@ -32,6 +32,7 @@ func init() {
xtcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logLevel
,
"log_level"
,
""
,
"info"
,
"log level"
)
xtcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
logFile
,
"log_file"
,
""
,
"console"
,
"console or file path"
)
xtcpCmd
.
PersistentFlags
()
.
IntVarP
(
&
logMaxDays
,
"log_max_days"
,
""
,
3
,
"log file reversed days"
)
xtcpCmd
.
PersistentFlags
()
.
BoolVarP
(
&
disableLogColor
,
"disable_log_color"
,
""
,
false
,
"disable log color in console"
)
xtcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
proxyName
,
"proxy_name"
,
"n"
,
""
,
"proxy name"
)
xtcpCmd
.
PersistentFlags
()
.
StringVarP
(
&
role
,
"role"
,
""
,
"server"
,
"role"
)
...
...
cmd/frps/main.go
浏览文件 @
388b0168
...
...
@@ -15,6 +15,9 @@
package
main
import
(
"math/rand"
"time"
"github.com/fatedier/golib/crypto"
_
"github.com/fatedier/frp/assets/frps/statik"
...
...
@@ -22,6 +25,7 @@ import (
func
main
()
{
crypto
.
DefaultSalt
=
"frp"
rand
.
Seed
(
time
.
Now
()
.
UnixNano
())
Execute
()
}
cmd/frps/root.go
浏览文件 @
388b0168
...
...
@@ -53,6 +53,7 @@ var (
logFile
string
logLevel
string
logMaxDays
int64
disableLogColor
bool
token
string
subDomainHost
string
tcpMux
bool
...
...
@@ -80,6 +81,8 @@ func init() {
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
logFile
,
"log_file"
,
""
,
"console"
,
"log file"
)
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
logLevel
,
"log_level"
,
""
,
"info"
,
"log level"
)
rootCmd
.
PersistentFlags
()
.
Int64VarP
(
&
logMaxDays
,
"log_max_days"
,
""
,
3
,
"log max days"
)
rootCmd
.
PersistentFlags
()
.
BoolVarP
(
&
disableLogColor
,
"disable_log_color"
,
""
,
false
,
"disable log color in console"
)
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
token
,
"token"
,
"t"
,
""
,
"auth token"
)
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
subDomainHost
,
"subdomain_host"
,
""
,
""
,
"subdomain host"
)
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
allowPorts
,
"allow_ports"
,
""
,
""
,
"allow ports"
)
...
...
@@ -191,12 +194,13 @@ func parseServerCommonCfgFromCmd() (err error) {
}
else
{
g
.
GlbServerCfg
.
LogWay
=
"file"
}
g
.
GlbServerCfg
.
DisableLogColor
=
disableLogColor
return
}
func
runServer
()
(
err
error
)
{
log
.
InitLog
(
g
.
GlbServerCfg
.
LogWay
,
g
.
GlbServerCfg
.
LogFile
,
g
.
GlbServerCfg
.
LogLevel
,
g
.
GlbServerCfg
.
LogMaxDays
)
g
.
GlbServerCfg
.
LogMaxDays
,
g
.
GlbServerCfg
.
DisableLogColor
)
svr
,
err
:=
server
.
NewService
()
if
err
!=
nil
{
return
err
...
...
conf/frpc_full.ini
浏览文件 @
388b0168
...
...
@@ -18,6 +18,9 @@ log_level = info
log_max_days
=
3
# disable log colors when log_file is console, default is false
disable_log_color
=
false
# for authentication
token
=
12345678
...
...
conf/frps_full.ini
浏览文件 @
388b0168
...
...
@@ -43,6 +43,9 @@ log_level = info
log_max_days
=
3
# disable log colors when log_file is console, default is false
disable_log_color
=
false
# auth token
token
=
12345678
...
...
models/config/client_common.go
浏览文件 @
388b0168
...
...
@@ -32,6 +32,7 @@ type ClientCommonConf struct {
LogWay
string
`json:"log_way"`
LogLevel
string
`json:"log_level"`
LogMaxDays
int64
`json:"log_max_days"`
DisableLogColor
bool
`json:"disable_log_color"`
Token
string
`json:"token"`
AdminAddr
string
`json:"admin_addr"`
AdminPort
int
`json:"admin_port"`
...
...
@@ -58,6 +59,7 @@ func GetDefaultClientConf() *ClientCommonConf {
LogWay
:
"console"
,
LogLevel
:
"info"
,
LogMaxDays
:
3
,
DisableLogColor
:
false
,
Token
:
""
,
AdminAddr
:
"127.0.0.1"
,
AdminPort
:
0
,
...
...
@@ -106,6 +108,10 @@ func UnmarshalClientConfFromIni(defaultCfg *ClientCommonConf, content string) (c
cfg
.
ServerPort
=
int
(
v
)
}
if
tmpStr
,
ok
=
conf
.
Get
(
"common"
,
"disable_log_color"
);
ok
&&
tmpStr
==
"true"
{
cfg
.
DisableLogColor
=
true
}
if
tmpStr
,
ok
=
conf
.
Get
(
"common"
,
"http_proxy"
);
ok
{
cfg
.
HttpProxy
=
tmpStr
}
...
...
models/config/server_common.go
浏览文件 @
388b0168
...
...
@@ -58,18 +58,19 @@ type ServerCommonConf struct {
DashboardAddr
string
`json:"dashboard_addr"`
// if DashboardPort equals 0, dashboard is not available
DashboardPort
int
`json:"dashboard_port"`
DashboardUser
string
`json:"dashboard_user"`
DashboardPwd
string
`json:"dashboard_pwd"`
AssetsDir
string
`json:"asserts_dir"`
LogFile
string
`json:"log_file"`
LogWay
string
`json:"log_way"`
// console or file
LogLevel
string
`json:"log_level"`
LogMaxDays
int64
`json:"log_max_days"`
Token
string
`json:"token"`
SubDomainHost
string
`json:"subdomain_host"`
TcpMux
bool
`json:"tcp_mux"`
Custom404Page
string
`json:"custom_404_page"`
DashboardPort
int
`json:"dashboard_port"`
DashboardUser
string
`json:"dashboard_user"`
DashboardPwd
string
`json:"dashboard_pwd"`
AssetsDir
string
`json:"asserts_dir"`
LogFile
string
`json:"log_file"`
LogWay
string
`json:"log_way"`
// console or file
LogLevel
string
`json:"log_level"`
LogMaxDays
int64
`json:"log_max_days"`
DisableLogColor
bool
`json:"disable_log_color"`
Token
string
`json:"token"`
SubDomainHost
string
`json:"subdomain_host"`
TcpMux
bool
`json:"tcp_mux"`
Custom404Page
string
`json:"custom_404_page"`
AllowPorts
map
[
int
]
struct
{}
MaxPoolCount
int64
`json:"max_pool_count"`
...
...
@@ -97,6 +98,7 @@ func GetDefaultServerConf() *ServerCommonConf {
LogWay
:
"console"
,
LogLevel
:
"info"
,
LogMaxDays
:
3
,
DisableLogColor
:
false
,
Token
:
""
,
SubDomainHost
:
""
,
TcpMux
:
true
,
...
...
@@ -244,6 +246,10 @@ func UnmarshalServerConfFromIni(defaultCfg *ServerCommonConf, content string) (c
}
}
if
tmpStr
,
ok
=
conf
.
Get
(
"common"
,
"disable_log_color"
);
ok
&&
tmpStr
==
"true"
{
cfg
.
DisableLogColor
=
true
}
cfg
.
Token
,
_
=
conf
.
Get
(
"common"
,
"token"
)
if
allowPortsStr
,
ok
:=
conf
.
Get
(
"common"
,
"allow_ports"
);
ok
{
...
...
utils/log/log.go
浏览文件 @
388b0168
...
...
@@ -29,16 +29,20 @@ func init() {
Log
.
SetLogFuncCallDepth
(
Log
.
GetLogFuncCallDepth
()
+
1
)
}
func
InitLog
(
logWay
string
,
logFile
string
,
logLevel
string
,
maxdays
int64
)
{
SetLogFile
(
logWay
,
logFile
,
maxdays
)
func
InitLog
(
logWay
string
,
logFile
string
,
logLevel
string
,
maxdays
int64
,
disableLogColor
bool
)
{
SetLogFile
(
logWay
,
logFile
,
maxdays
,
disableLogColor
)
SetLogLevel
(
logLevel
)
}
// SetLogFile to configure log params
// logWay: file or console
func
SetLogFile
(
logWay
string
,
logFile
string
,
maxdays
int64
)
{
func
SetLogFile
(
logWay
string
,
logFile
string
,
maxdays
int64
,
disableLogColor
bool
)
{
if
logWay
==
"console"
{
Log
.
SetLogger
(
"console"
,
""
)
params
:=
""
if
disableLogColor
{
params
=
fmt
.
Sprintf
(
`{"color": false}`
)
}
Log
.
SetLogger
(
"console"
,
params
)
}
else
{
params
:=
fmt
.
Sprintf
(
`{"filename": "%s", "maxdays": %d}`
,
logFile
,
maxdays
)
Log
.
SetLogger
(
"file"
,
params
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录