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

resolve the correct log path based on taskAppDirectory #1273

Merged
merged 1 commit into from Sep 14, 2016

Conversation

Projects
None yet
2 participants
@ssalinas
Member

ssalinas commented Sep 12, 2016

Attempt at fixing #1214 , still needs a bit more tweaking to work for all cases + some testing

/fyi @eherot

@ssalinas ssalinas added the hs_staging label Sep 12, 2016

@ssalinas ssalinas modified the milestone: 0.11.0 Sep 12, 2016

@ssalinas ssalinas added the hs_qa label Sep 13, 2016

Show outdated Hide outdated ...pot/singularity/executor/task/SingularityExecutorTaskProcessBuilder.java
@@ -10,6 +11,7 @@
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import com.hubspot.deploy.ExecutorData;
import com.hubspot.mesos.MesosUtils;

This comment has been minimized.

@tpetr

tpetr Sep 14, 2016

Member

unused import?

@tpetr

tpetr Sep 14, 2016

Member

unused import?

This comment has been minimized.

@ssalinas

ssalinas Sep 14, 2016

Member

fixed

Show outdated Hide outdated ...pot/singularity/executor/task/SingularityExecutorTaskProcessBuilder.java
}
Path basePath = task.getTaskDefinition().getTaskDirectoryPath();
String appPath = configuration.getTaskAppDirectory().startsWith("./") ? configuration.getTaskAppDirectory().replace("./", "") : configuration.getTaskAppDirectory();
Path app = basePath.resolve(appPath);

This comment has been minimized.

@tpetr

tpetr Sep 14, 2016

Member

you should be able to collapse these two lines to just basePath.resolve(configuration.getTaskAppDirectory()).normalize()

@tpetr

tpetr Sep 14, 2016

Member

you should be able to collapse these two lines to just basePath.resolve(configuration.getTaskAppDirectory()).normalize()

@tpetr

This comment has been minimized.

Show comment
Hide comment
@tpetr

tpetr Sep 14, 2016

Member

🚢

Member

tpetr commented on b6d6d43 Sep 14, 2016

🚢

@ssalinas ssalinas added the hs_stable label Sep 14, 2016

@ssalinas ssalinas merged commit 1204003 into master Sep 14, 2016

0 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details

@ssalinas ssalinas deleted the task_app_directory branch Sep 14, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment