aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-07-18 02:18:31 +0800
committerGitHub <noreply@github.com>2017-07-18 02:18:31 +0800
commit8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09 (patch)
tree22d5b1799872acec4897e93e8c443e4158b61066
parent23c6fcdbe834b70ff25473e6ff03da94814609c1 (diff)
parent9488e7fd5fee6e88911758ba8202409004edec63 (diff)
downloadgo-tangerine-8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09.tar
go-tangerine-8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09.tar.gz
go-tangerine-8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09.tar.bz2
go-tangerine-8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09.tar.lz
go-tangerine-8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09.tar.xz
go-tangerine-8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09.tar.zst
go-tangerine-8a8fc5f8ef102eac661cd4c4ea8baf433be6cd09.zip
Merge pull request #14823 from karalabe/puppeth-limited-logging
cmd/puppeth: limit cotnainers to 10MB logs
-rw-r--r--cmd/puppeth/module_dashboard.go5
-rw-r--r--cmd/puppeth/module_ethstats.go5
-rw-r--r--cmd/puppeth/module_faucet.go5
-rw-r--r--cmd/puppeth/module_nginx.go5
-rw-r--r--cmd/puppeth/module_node.go5
5 files changed, 25 insertions, 0 deletions
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index 17f119111..1cf6cab79 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -425,6 +425,11 @@ services:
- "{{.Port}}:80"{{else}}
environment:
- VIRTUAL_HOST={{.VHost}}{{end}}
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "10"
restart: always
`
diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go
index 571df1454..da34acb3b 100644
--- a/cmd/puppeth/module_ethstats.go
+++ b/cmd/puppeth/module_ethstats.go
@@ -60,6 +60,11 @@ services:
environment:
- WS_SECRET={{.Secret}}{{if .VHost}}
- VIRTUAL_HOST={{.VHost}}{{end}}
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "10"
restart: always
`
diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go
index 5a5dc6506..acf1e4324 100644
--- a/cmd/puppeth/module_faucet.go
+++ b/cmd/puppeth/module_faucet.go
@@ -82,6 +82,11 @@ services:
- CAPTCHA_SECRET={{.CaptchaSecret}}{{if .VHost}}
- VIRTUAL_HOST={{.VHost}}
- VIRTUAL_PORT=8080{{end}}
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "10"
restart: always
`
diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go
index 0eac5ace5..fd6d1d74e 100644
--- a/cmd/puppeth/module_nginx.go
+++ b/cmd/puppeth/module_nginx.go
@@ -43,6 +43,11 @@ services:
- "{{.Port}}:80"
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "10"
restart: always
`
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go
index ce1d34135..9fe97c892 100644
--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@@ -68,6 +68,11 @@ services:
- MINER_NAME={{.Etherbase}}
- GAS_TARGET={{.GasTarget}}
- GAS_PRICE={{.GasPrice}}
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "10"
restart: always
`