Skip to content

Commit

Permalink
Stop ./scripts/start once Malcolm has finished starting
Browse files Browse the repository at this point in the history
  • Loading branch information
Njinx authored and mmguero committed Feb 27, 2023
1 parent 23665c3 commit 2177413
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions scripts/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,9 @@ def logs():
r'^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])?$'
)

finishedStartingRegEx = re.compile(r'.+Pipelines\s+running\s+\{.*:non_running_pipelines=>\[\]\}')
finishedStarting = False

# increase COMPOSE_HTTP_TIMEOUT to be ridiculously large so docker-compose never times out the TTY doing debug output
osEnv = os.environ.copy()
osEnv['COMPOSE_HTTP_TIMEOUT'] = '100000000'
Expand Down Expand Up @@ -499,6 +502,8 @@ def logs():
outputStrEscaped = EscapeAnsi(outputStr)
if ignoreRegEx.match(outputStrEscaped):
pass ### print(f'!!!!!!!: {outputStr}')
elif finishedStartingRegEx.match(outputStrEscaped) and (args.cmdStart or args.cmdRestart):
finishedStarting = True
else:
serviceMatch = serviceRegEx.search(outputStrEscaped)
serviceMatchFmt = serviceRegEx.search(outputStr) if coloramaImported else serviceMatch
Expand Down

0 comments on commit 2177413

Please sign in to comment.