From e334deea6021a4c9389a93d56fc7ed30d9aade51 Mon Sep 17 00:00:00 2001 From: Adam Hopkins Date: Fri, 3 Dec 2021 12:31:03 +0200 Subject: [PATCH 1/3] Resolve potential bug in MOTD in Docker --- sanic/application/motd.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sanic/application/motd.py b/sanic/application/motd.py index 27c3666354..f21aa246be 100644 --- a/sanic/application/motd.py +++ b/sanic/application/motd.py @@ -65,7 +65,9 @@ def __init__(self, *args, **kwargs) -> None: def set_variables(self): # no cov fallback = (80, 24) - terminal_width = min(get_terminal_size(fallback=fallback).columns, 108) + terminal_width = max( + min(get_terminal_size().columns, 108), fallback[0] + ) self.max_value_width = terminal_width - fallback[0] + 36 self.key_width = 4 From 2405b03a3eba2d0666558325f7ae395db6f7d00d Mon Sep 17 00:00:00 2001 From: Adam Hopkins Date: Fri, 3 Dec 2021 12:33:27 +0200 Subject: [PATCH 2/3] squash --- sanic/application/motd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sanic/application/motd.py b/sanic/application/motd.py index f21aa246be..a123e81348 100644 --- a/sanic/application/motd.py +++ b/sanic/application/motd.py @@ -66,7 +66,7 @@ def __init__(self, *args, **kwargs) -> None: def set_variables(self): # no cov fallback = (80, 24) terminal_width = max( - min(get_terminal_size().columns, 108), fallback[0] + min(get_terminal_size(fallback=fallback).columns, 108), fallback[0] ) self.max_value_width = terminal_width - fallback[0] + 36 From 6f6e0d266b66628b65959103ca4e968922b332b8 Mon Sep 17 00:00:00 2001 From: Adam Hopkins Date: Fri, 3 Dec 2021 12:37:35 +0200 Subject: [PATCH 3/3] squash --- sanic/application/motd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sanic/application/motd.py b/sanic/application/motd.py index a123e81348..32825b12c3 100644 --- a/sanic/application/motd.py +++ b/sanic/application/motd.py @@ -64,9 +64,9 @@ def __init__(self, *args, **kwargs) -> None: self.set_variables() def set_variables(self): # no cov - fallback = (80, 24) + fallback = (108, 24) terminal_width = max( - min(get_terminal_size(fallback=fallback).columns, 108), fallback[0] + get_terminal_size(fallback=fallback).columns, fallback[0] ) self.max_value_width = terminal_width - fallback[0] + 36