From 1e3481648eabe4ce03a356e0d0bc05366c96cc9b Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Fri, 6 Aug 2021 19:17:25 +0200 Subject: [PATCH 1/3] fix(storage): updated FS_CLEAN_HRS Dockerfile definition --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index fe6e757e4..caf7345d9 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -42,7 +42,7 @@ ENV TZ=UTC \ AWS_REGION_ASSETS=eu-central-1 \ CACHE_ASSETS=false \ ASSETS_SIZE_LIMIT=6291456 \ - FS_CLEAN_HRS=0 + FS_CLEAN_HRS=12 ARG SERVICE_NAME From a08741828686e7c62872a85d8558f329b082461a Mon Sep 17 00:00:00 2001 From: ShiKhu Date: Sat, 7 Aug 2021 11:54:54 +0800 Subject: [PATCH 2/3] fix(backend): env parsing fix to accept 0 as correct value --- backend/pkg/env/vars.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/pkg/env/vars.go b/backend/pkg/env/vars.go index 64e586cc3..4a3a194b0 100644 --- a/backend/pkg/env/vars.go +++ b/backend/pkg/env/vars.go @@ -18,24 +18,24 @@ func StringOptional(key string) string { return os.Getenv(key) } -func Uint16(key string) uint16 { - v := String(key) - n, _ := strconv.ParseUint(v, 10, 16) - if n == 0 { - log.Fatalln(key + " has a wrong value") - } - return uint16(n) -} - func Uint64(key string) uint64 { v := String(key) - n, _ := strconv.ParseUint(v, 10, 64) - if n == 0 { - log.Fatalln(key + " has a wrong value") + n, err := strconv.ParseUint(v, 10, 64) + if err != nil { + log.Fatalln(key + " has a wrong value. " + err) } return n } +func Uint16(key string) uint16 { + v := String(key) + n, err := strconv.ParseUint(v, 10, 16) + if err != nil { + log.Fatalln(key + " has a wrong value. " + err) + } + return uint16(n) +} + func Int(key string) int { return int(Uint64(key)) } From 1b2241943af0881c9f7f221f7d87bb1d5063ac8b Mon Sep 17 00:00:00 2001 From: ShiKhu Date: Sat, 7 Aug 2021 11:57:10 +0800 Subject: [PATCH 3/3] fix(backend): put FS_CLEAN_HRS default value to 10 days --- backend/Dockerfile | 2 +- backend/pkg/env/vars.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index caf7345d9..43ea47d22 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -42,7 +42,7 @@ ENV TZ=UTC \ AWS_REGION_ASSETS=eu-central-1 \ CACHE_ASSETS=false \ ASSETS_SIZE_LIMIT=6291456 \ - FS_CLEAN_HRS=12 + FS_CLEAN_HRS=240 ARG SERVICE_NAME diff --git a/backend/pkg/env/vars.go b/backend/pkg/env/vars.go index 4a3a194b0..a5334b301 100644 --- a/backend/pkg/env/vars.go +++ b/backend/pkg/env/vars.go @@ -22,7 +22,7 @@ func Uint64(key string) uint64 { v := String(key) n, err := strconv.ParseUint(v, 10, 64) if err != nil { - log.Fatalln(key + " has a wrong value. " + err) + log.Fatalln(key + " has a wrong value. ", err) } return n } @@ -31,7 +31,7 @@ func Uint16(key string) uint16 { v := String(key) n, err := strconv.ParseUint(v, 10, 16) if err != nil { - log.Fatalln(key + " has a wrong value. " + err) + log.Fatalln(key + " has a wrong value. ", err) } return uint16(n) }