Merge pull request #33 from billdodd/fix/term_size

Fix OSError when piping output of rf_logs.py
DMTF · Mar 13, 2020 · 3820743 · 3820743
2 parents bff6d5a + a33830d
commit 3820743
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/redfish_utilities/logs.py b/redfish_utilities/logs.py
@@ -12,7 +12,7 @@
         with the log service for a given Redfish service
 """
 
-import os
+import shutil
 
 from .messages import verify_response
 from enum import Enum
@@ -75,7 +75,7 @@ def print_log_entries( log_entries, details = False ):
     """
 
     # Set up templates
-    console_size = os.get_terminal_size()
+    console_size = shutil.get_terminal_size(fallback=(80, 24))
     message_size = console_size.columns - 38
     entry_line_format = "  {:5s} | {:25s} | {}"
     detail_line_format = "  {:33s} | {}: {}"

diff --git a/scripts/rf_logs.py b/scripts/rf_logs.py
@@ -12,6 +12,8 @@
 """
 
 import argparse
+import sys
+
 import redfish
 import redfish_utilities
 
@@ -60,3 +62,4 @@
         redfish_utilities.print_log_entries( log_entries, args.details )
 finally:
     redfish_obj.logout()
+    sys.stderr.close()