CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

use high error code to flag an unrecoverable error

Browse Source
This commit is contained in:
Jason Ertel
2023-03-06 18:56:04 -05:00
parent f77068f73f
commit b641dc37b6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
salt/common/tools/sbin/so-status
View File

@@ -30,8 +30,8 @@ def showUsage(options, args):
print(' 0 - Success, system appears to be running correctly') print(' 0 - Success, system appears to be running correctly')
print(' 1 - Error, one or more subsystems are not running') print(' 1 - Error, one or more subsystems are not running')
print(' 2 - System is starting') print(' 2 - System is starting')
print(' 3 - System installation encountered errors')
print(' 99 - Installation in progress') print(' 99 - Installation in progress')
print(' 100 - System installation encountered errors')
sys.exit(1) sys.exit(1)
@@ -42,7 +42,7 @@ def fail(msg):
def check_installation_status(options, console): def check_installation_status(options, console):
if "-i" in options and os.path.isfile('/root/failure'): if "-i" in options and os.path.isfile('/root/failure'):
return 3 return 100
return 0 return 0
@@ -72,10 +72,10 @@ def output(options, console, code, data):
elif "-q" not in options: elif "-q" not in options:
if code == 2: if code == 2:
console.print(" [bold yellow]:hourglass: [bold white]System appears to be starting. No highstate has completed since the system was restarted.") console.print(" [bold yellow]:hourglass: [bold white]System appears to be starting. No highstate has completed since the system was restarted.")
if code == 3:
console.print(" [bold red]:exclamation: [bold white]Installation encountered errors.")
elif code == 99: elif code == 99:
console.print(" [bold red]:exclamation: [bold white]Installation does not appear to be complete. A highstate has not fully completed.") console.print(" [bold red]:exclamation: [bold white]Installation does not appear to be complete. A highstate has not fully completed.")
elif code == 100:
console.print(" [bold red]:exclamation: [bold white]Installation encountered errors.")
else: else:
table = Table(title = "Security Onion Status", show_edge = False, safe_box = True, box = box.MINIMAL) table = Table(title = "Security Onion Status", show_edge = False, safe_box = True, box = box.MINIMAL)
table.add_column("Container", justify="right", style="white", no_wrap=True) table.add_column("Container", justify="right", style="white", no_wrap=True)