MDL-25500 lock: post integration trivial cleanup

* A couple of misc comment typo's
* Added missing $CFG required global in file_lock_factory::is_available
* Removed unused $CFG global from file_lock_factory::get_lock
* A couple of trivial phpdoc tweaks
* Removed unused $DB global from postgres_lock_factory::get_index_from_key
* Added global namespace \ to exceptions in get_index_from_key (tested and found they didn't resolve)
This commit is contained in:
Sam Hemelryk
2014-01-29 13:22:16 +13:00
parent 453d66b782
commit 34027f1563
7 changed files with 15 additions and 14 deletions
+4 -5
View File
@@ -50,7 +50,7 @@ class postgres_lock_factory implements lock_factory {
/** @var array $lockidcache - static cache for string -> int conversions required for pg advisory locks. */
protected static $lockidcache = array();
/** @var moodle_database $db Hold a reference to the global $DB */
/** @var \moodle_database $db Hold a reference to the global $DB */
protected $db;
/** @var string $type Used to prefix lock keys */
@@ -133,10 +133,9 @@ class postgres_lock_factory implements lock_factory {
*
* @param string $key
* @return int
* @throws \moodle_exception
*/
protected function get_index_from_key($key) {
global $DB;
if (isset(self::$lockidcache[$key])) {
return self::$lockidcache[$key];
}
@@ -152,7 +151,7 @@ class postgres_lock_factory implements lock_factory {
$record->resourcekey = $key;
try {
$index = $this->db->insert_record('lock_db', $record);
} catch (dml_exception $de) {
} catch (\dml_exception $de) {
// Race condition - never mind - now the value is guaranteed to exist.
$record = $this->db->get_record('lock_db', array('resourcekey' => $key));
if ($record) {
@@ -162,7 +161,7 @@ class postgres_lock_factory implements lock_factory {
}
if (!$index) {
throw new moodle_exception('Could not generate unique index for key');
throw new \moodle_exception('Could not generate unique index for key');
}
self::$lockidcache[$key] = $index;