Set warnings filter on CLI programs.

Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
This commit is contained in:
Chris PeBenito 2023-03-27 09:30:26 -04:00
parent 5943451017
commit 865f523b1f
7 changed files with 53 additions and 0 deletions

11
apol
View File

@ -7,6 +7,7 @@
import sys import sys
import argparse import argparse
import logging import logging
import warnings
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
import setools import setools
@ -30,13 +31,23 @@ if args.debug:
console_handler.setLevel(logging.DEBUG) console_handler.setLevel(logging.DEBUG)
console_handler.setFormatter( console_handler.setFormatter(
logging.Formatter('%(asctime)s|%(levelname)s|%(name)s|%(message)s')) logging.Formatter('%(asctime)s|%(levelname)s|%(name)s|%(message)s'))
if not sys.warnoptions:
warnings.simplefilter("default")
elif args.verbose: elif args.verbose:
console_handler.setLevel(logging.INFO) console_handler.setLevel(logging.INFO)
console_handler.setFormatter(logging.Formatter('%(message)s')) console_handler.setFormatter(logging.Formatter('%(message)s'))
if not sys.warnoptions:
warnings.simplefilter("default")
else: else:
console_handler.setLevel(logging.WARNING) console_handler.setLevel(logging.WARNING)
console_handler.setFormatter(logging.Formatter('%(message)s')) console_handler.setFormatter(logging.Formatter('%(message)s'))
if not sys.warnoptions:
warnings.simplefilter("ignore")
logging.getLogger().addHandler(console_handler) logging.getLogger().addHandler(console_handler)
try: try:

View File

@ -9,6 +9,7 @@ import argparse
import sys import sys
import logging import logging
import signal import signal
import warnings
signal.signal(signal.SIGPIPE, signal.SIG_DFL) signal.signal(signal.SIGPIPE, signal.SIG_DFL)
@ -26,10 +27,16 @@ args = parser.parse_args()
if args.debug: if args.debug:
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s|%(levelname)s|%(name)s|%(message)s') format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
elif args.verbose: elif args.verbose:
logging.basicConfig(level=logging.INFO, format='%(message)s') logging.basicConfig(level=logging.INFO, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
else: else:
logging.basicConfig(level=logging.WARNING, format='%(message)s') logging.basicConfig(level=logging.WARNING, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("ignore")
try: try:
p = setools.SELinuxPolicy(args.policy) p = setools.SELinuxPolicy(args.policy)

7
sediff
View File

@ -9,6 +9,7 @@ import argparse
import sys import sys
import logging import logging
import signal import signal
import warnings
from itertools import chain from itertools import chain
from contextlib import suppress from contextlib import suppress
from typing import List from typing import List
@ -115,10 +116,16 @@ all_differences = not any((args.class_, args.common, args.type_, args.attribute,
if args.debug: if args.debug:
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s|%(levelname)s|%(name)s|%(message)s') format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
elif args.verbose: elif args.verbose:
logging.basicConfig(level=logging.INFO, format='%(message)s') logging.basicConfig(level=logging.INFO, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
else: else:
logging.basicConfig(level=logging.WARNING, format='%(message)s') logging.basicConfig(level=logging.WARNING, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("ignore")
try: try:
p1 = setools.SELinuxPolicy(args.POLICY1[0]) p1 = setools.SELinuxPolicy(args.POLICY1[0])

7
sedta
View File

@ -8,6 +8,7 @@ import sys
import argparse import argparse
import logging import logging
import signal import signal
import warnings
import setools import setools
@ -97,10 +98,16 @@ if args.target and not (args.shortest_path or args.all_paths):
if args.debug: if args.debug:
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s|%(levelname)s|%(name)s|%(message)s') format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
elif args.verbose: elif args.verbose:
logging.basicConfig(level=logging.INFO, format='%(message)s') logging.basicConfig(level=logging.INFO, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
else: else:
logging.basicConfig(level=logging.WARNING, format='%(message)s') logging.basicConfig(level=logging.WARNING, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("ignore")
try: try:
p = setools.SELinuxPolicy(args.policy) p = setools.SELinuxPolicy(args.policy)

7
seinfo
View File

@ -11,6 +11,7 @@ import sys
import logging import logging
import signal import signal
import ipaddress import ipaddress
import warnings
from typing import Callable, List, Tuple from typing import Callable, List, Tuple
@ -102,10 +103,16 @@ args = parser.parse_args()
if args.debug: if args.debug:
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s|%(levelname)s|%(name)s|%(message)s') format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
elif args.verbose: elif args.verbose:
logging.basicConfig(level=logging.INFO, format='%(message)s') logging.basicConfig(level=logging.INFO, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
else: else:
logging.basicConfig(level=logging.WARNING, format='%(message)s') logging.basicConfig(level=logging.WARNING, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("ignore")
try: try:
p = setools.SELinuxPolicy(args.policy) p = setools.SELinuxPolicy(args.policy)

View File

@ -9,6 +9,7 @@ import argparse
import sys import sys
import logging import logging
import signal import signal
import warnings
from typing import Dict, Optional from typing import Dict, Optional
signal.signal(signal.SIGPIPE, signal.SIG_DFL) signal.signal(signal.SIGPIPE, signal.SIG_DFL)
@ -66,10 +67,16 @@ if args.limit_flows < 0:
if args.debug: if args.debug:
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s|%(levelname)s|%(name)s|%(message)s') format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
elif args.verbose: elif args.verbose:
logging.basicConfig(level=logging.INFO, format='%(message)s') logging.basicConfig(level=logging.INFO, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
else: else:
logging.basicConfig(level=logging.WARNING, format='%(message)s') logging.basicConfig(level=logging.WARNING, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("ignore")
booleans: Optional[Dict[str, bool]] = None booleans: Optional[Dict[str, bool]] = None
if args.booleans == 'default': if args.booleans == 'default':

View File

@ -9,6 +9,7 @@ import argparse
import sys import sys
import logging import logging
import signal import signal
import warnings
signal.signal(signal.SIGPIPE, signal.SIG_DFL) signal.signal(signal.SIGPIPE, signal.SIG_DFL)
@ -125,10 +126,16 @@ if not args.tertypes and not args.mlsrtypes and not args.rbacrtypes:
if args.debug: if args.debug:
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s|%(levelname)s|%(name)s|%(message)s') format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
elif args.verbose: elif args.verbose:
logging.basicConfig(level=logging.INFO, format='%(message)s') logging.basicConfig(level=logging.INFO, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("default")
else: else:
logging.basicConfig(level=logging.WARNING, format='%(message)s') logging.basicConfig(level=logging.WARNING, format='%(message)s')
if not sys.warnoptions:
warnings.simplefilter("ignore")
try: try:
p = setools.SELinuxPolicy(args.policy) p = setools.SELinuxPolicy(args.policy)