Minor, unlock after discovery exception.

This commit is contained in:
epriestley
2012-07-03 07:46:38 -07:00
parent c821639e93
commit dcf3a31944

View File

@@ -139,13 +139,19 @@ final class PhabricatorRepositoryPullLocalDaemon
$this->pullRepository($repository); $this->pullRepository($repository);
if (!$no_discovery) { if (!$no_discovery) {
// TODO: It would be nice to discover only if we pulled something,
// but this isn't totally trivial.
$lock_name = get_class($this).':'.$callsign; $lock_name = get_class($this).':'.$callsign;
$lock = PhabricatorGlobalLock::newLock($lock_name); $lock = PhabricatorGlobalLock::newLock($lock_name);
$lock->lock(); $lock->lock();
// TODO: It would be nice to discover only if we pulled something, try {
// but this isn't totally trivial.
$this->discoverRepository($repository); $this->discoverRepository($repository);
} catch (Exception $ex) {
$lock->unlock();
throw $ex;
}
$lock->unlock(); $lock->unlock();
} }