diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #22236 [Lock] Add missing message in Exceptions (jderusse)

Browse Source 
This PR was merged into the 3.3-dev branch.

Discussion
----------

[Lock] Add missing message in Exceptions

| Q             | A
| ------------- | ---
| Branch?       | maste
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

d35db5db29 Add message in exception
This commit is contained in:
Fabien Potencier 2017-04-02 19:32:40 +02:00
commit 365716d9dc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Lock/Lock.php
View File

@ -58,7 +58,7 @@ final class Lock implements LockInterface, LoggerAwareInterface
$this->store->waitAndSave($this->key);
}
$this->logger->info('Lock successfully acquired for "{resource}".', array('resource' => $this->key));
$this->logger->info('Successfully acquired the "{resource}" lock.', array('resource' => $this->key));
if ($this->ttl) {
$this->refresh();
@ -66,7 +66,7 @@ final class Lock implements LockInterface, LoggerAwareInterface
return true;
} catch (LockConflictedException $e) {
$this->logger->warning('Failed to lock the "{resource}". Someone else already acquired the lock.', array('resource' => $this->key));
$this->logger->warning('Failed to acquire the "{resource}" lock. Someone else already acquired the lock.', array('resource' => $this->key));
if ($blocking) {
throw $e;
@ -74,8 +74,8 @@ final class Lock implements LockInterface, LoggerAwareInterface
return false;
} catch (\Exception $e) {
$this->logger->warning('Failed to lock the "{resource}".', array('resource' => $this->key, 'exception' => $e));
throw new LockAcquiringException('', 0, $e);
$this->logger->warning('Failed to acquire the "{resource}" lock.', array('resource' => $this->key, 'exception' => $e));
throw new LockAcquiringException(sprintf('Failed to acquire the "%s" lock.', $this->key), 0, $e);
}
}
@ -96,7 +96,7 @@ final class Lock implements LockInterface, LoggerAwareInterface
throw $e;
} catch (\Exception $e) {
$this->logger->warning('Failed to define an expiration for the "{resource}" lock.', array('resource' => $this->key, 'exception' => $e));
throw new LockAcquiringException('', 0, $e);
throw new LockAcquiringException(sprintf('Failed to define an expiration for the "%s" lock.', $this->key), 0, $e);
}
}
@ -117,7 +117,7 @@ final class Lock implements LockInterface, LoggerAwareInterface
if ($this->store->exists($this->key)) {
$this->logger->warning('Failed to release the "{resource}" lock.', array('resource' => $this->key));
throw new LockReleasingException();
throw new LockReleasingException(sprintf('Failed to release the "%s" lock.', $this->key));
}
}
}