Skip to content

only show Task killed in message for healthchecks if not in running state #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssalinas merged 2 commits into from
Jun 14, 2016
Merged

only show Task killed in message for healthchecks if not in running state #1044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
745ae95
only show Task killed i message for healthchecks if not in running state
ssalinas May 18, 2016
f539ba2
helper name
ssalinas May 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SingularityUI/app/templates/taskDetail/taskHealthcheckNotification.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
{{#if lastHealthcheckFailed}}
{{#with data.healthcheckResults.[0]}}
<div class="alert alert-warning" role="alert">
<b>Task killed due to no passing healthchecks after {{#if ../tooManyRetries}}{{../numberFailed}} tries{{else}}{{../secondsElapsed}} seconds{{/if}}:</b> Last healthcheck {{#if statusCode}}responded with <span class="label label-danger">HTTP {{statusCode}}</span>{{else}}did not respond{{/if}}{{#if durationMillis}} in {{durationMillis}}ms{{/if}} at {{timestampFormattedWithSeconds timestamp}}. <a href="#health-checks" data-action="viewHealthchecks">View all healthchecks.</a> <a href="{{ appRoot }}/task/{{ ../data.taskId }}/tail/{{ substituteTaskId ../config.finishedTaskLogPath ../data.taskId }}">View service logs.</a>
<b>{{#isRunningState ../data/taskUpdates}}No{{else}}Task killed due to no{{/isRunningState}} passing healthchecks after {{#if ../tooManyRetries}}{{../numberFailed}} tries{{else}}{{../secondsElapsed}} seconds{{/if}}:</b> Last healthcheck {{#if statusCode}}responded with <span class="label label-danger">HTTP {{statusCode}}</span>{{else}}did not respond{{/if}}{{#if durationMillis}} in {{durationMillis}}ms{{/if}} at {{timestampFormattedWithSeconds timestamp}}. <a href="#health-checks" data-action="viewHealthchecks">View all healthchecks.</a> <a href="{{ appRoot }}/task/{{ ../data.taskId }}/tail/{{ substituteTaskId ../config.finishedTaskLogPath ../data.taskId }}">View service logs.</a>
{{#if ../healthcheckFailureReasonMessage}}
<p>
The healthcheck failed because {{ ../healthcheckFailureReasonMessage}}
Expand Down