Skip to content
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.

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

Do not default app state to running #733

Merged
merged 2 commits into from Apr 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -6,6 +6,7 @@
- \#3519 - The default Docker network should be host
- \#3587 - Not specifying "network" config causes mesos to thrash
- \#3652 - Error paths are mapped incorrectly
- \#3092 - Delayed applications can appear to be running

### Changed
- \#3426 - Improve ports validation
Expand Down
3 changes: 2 additions & 1 deletion src/js/stores/AppsStore.js
Expand Up @@ -128,11 +128,12 @@ function processApp(app) {

app = calculateTotalResources(app);

app.status = AppStatus.RUNNING;
if (app.deployments.length > 0) {
app.status = AppStatus.DEPLOYING;
} else if (app.instances === 0 && app.tasksRunning === 0) {
app.status = AppStatus.SUSPENDED;
} else if (app.tasksRunning > 0) {
app.status = AppStatus.RUNNING;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After releasing 1.0.1 we need to port this fix on master in https://github.com/mesosphere/marathon-ui/blob/master/src/js/stores/AppsStore.js#L131

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll create a PR already

}
app.type = getAppType(app);
app.health = getAppHealth(app);
Expand Down