Skip to content

Commit 62038c2

Browse files
committed
Update docs
1 parent 5e5a764 commit 62038c2

File tree

9 files changed

+24
-3
lines changed

9 files changed

+24
-3
lines changed

addrs=127.0.0.1:6379 db=1/000002.ldb

148 Bytes
Binary file not shown.

addrs=127.0.0.1:6379 db=1/CURRENT

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MANIFEST-000004

addrs=127.0.0.1:6379 db=1/CURRENT.bak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MANIFEST-000000

addrs=127.0.0.1:6379 db=1/LOCK

Whitespace-only changes.

addrs=127.0.0.1:6379 db=1/LOG

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
=============== Apr 1, 2021 (CST) ===============
2+
15:57:07.855990 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
3+
15:57:07.916404 db@open opening
4+
15:57:07.917003 version@stat F·[] S·0B[] Sc·[]
5+
15:57:07.994290 db@janitor F·2 G·0
6+
15:57:07.994634 db@open done T·78.176316ms
7+
=============== Apr 1, 2021 (CST) ===============
8+
15:58:00.907990 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
9+
15:58:00.909620 version@stat F·[] S·0B[] Sc·[]
10+
15:58:00.909648 db@open opening
11+
15:58:00.909720 journal@recovery F·1
12+
15:58:00.909854 journal@recovery recovering @1
13+
15:58:00.933564 memdb@flush created L0@2 N·2 S·148B "iss..igh,v2":"iss..low,v1"
14+
15:58:00.933889 version@stat F·[1] S·148B[148B] Sc·[0.25]
15+
15:58:01.004032 db@janitor F·3 G·0
16+
15:58:01.004070 db@open done T·94.413021ms
181 Bytes
Binary file not shown.

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ And used by `[attachment]`, `[lfs]` and etc. as `STORAGE_TYPE`.
961961

962962
## Proxy (`proxy`)
963963

964-
- `PROXY_ENABLED`: **true**: Enable the proxy, all requests to external via HTTP will be affected
964+
- `PROXY_ENABLED`: **true**: Enable the proxy if true, all requests to external via HTTP will be affected, if false, no proxy will be used even environment http_proxy/https_proxy
965965
- `PROXY_URL`: ****: Proxy server URL, support http://, https//, socks://, blank will follow environment http_proxy/https_proxy
966966
- `PROXY_HOSTS`: ****: Comma separated list of host names requiring proxy. Glob patterns (*) are accepted; use ** to match all hosts.
967967

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ MINIO_USE_SSL = false
380380

381381
## Proxy (`proxy`)
382382

383-
- `PROXY_ENABLED`: **true**: 是否启用全局代理
383+
- `PROXY_ENABLED`: **true**: 是否启用全局代理。如果为否,则不使用代理,环境变量中的代理也不使用
384384
- `PROXY_URL`: ****: 代理服务器地址,支持 http://, https//, socks://,为空则不启用代理而使用环境变量中的 http_proxy/https_proxy
385385
- `PROXY_HOSTS`: ****: 逗号分隔的多个需要代理的网址,支持 * 号匹配符号, ** 表示匹配所有网站
386386

modules/proxy/proxy.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ var (
2222

2323
// SystemProxy returns the system proxy
2424
func SystemProxy() func(req *http.Request) (*url.URL, error) {
25-
if !setting.Proxy.Enabled || setting.Proxy.ProxyURL == "" {
25+
if !setting.Proxy.Enabled {
26+
return nil
27+
}
28+
if setting.Proxy.ProxyURL == "" {
2629
return http.ProxyFromEnvironment
2730
}
2831

0 commit comments

Comments
 (0)