D10383.id24991.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10383.id24991.diff
View Options

	diff --git a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
	--- a/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
	+++ b/src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
	@@ -28,14 +28,23 @@
	// finished.
	$plan = $build->getBuildPlan();

	- $log = $build->createLog($build_target, 'waiting', 'blockers');
	- $log_start = $log->start();
	+ $existing_logs = id(new HarbormasterBuildLogQuery())
	+ ->setViewer(PhabricatorUser::getOmnipotentUser())
	+ ->withBuildTargetPHIDs(array($build_target->getPHID()))
	+ ->execute();
	+
	+ if ($existing_logs) {
	+ $log = head($existing_logs);
	+ } else {
	+ $log = $build->createLog($build_target, 'waiting', 'blockers');
	+ }

	$blockers = $this->getBlockers($object, $plan, $build);
	if ($blockers) {
	+ $log->start();
	$log->append("Blocked by: ".implode(',', $blockers)."\n");
	+ $log->finalize();
	}
	- $log->finalize($log_start);

	if ($blockers) {
	throw new PhabricatorWorkerYieldException(15);