Commit e113a47e authored by Erick Hitter's avatar Erick Hitter Committed by GitHub
Browse files

Merge branch 'master' into add/cli-orchestration

parents d6dfe7b4 7c089e0c
...@@ -15,7 +15,7 @@ class Lock { ...@@ -15,7 +15,7 @@ class Lock {
public static function check_lock( $lock, $limit = null, $timeout = null ) { public static function check_lock( $lock, $limit = null, $timeout = null ) {
// Timeout, should a process die before its lock is freed // Timeout, should a process die before its lock is freed
if ( ! is_numeric( $timeout ) ) { if ( ! is_numeric( $timeout ) ) {
$timeout = LOCK_DEFULT_TIMEOUT_IN_MINUTES * \MINUTE_IN_SECONDS; $timeout = LOCK_DEFAULT_TIMEOUT_IN_MINUTES * \MINUTE_IN_SECONDS;
} }
// Check for, and recover from, deadlock // Check for, and recover from, deadlock
......
...@@ -32,4 +32,4 @@ const JOB_LOCK_EXPIRY_IN_MINUTES = 30; ...@@ -32,4 +32,4 @@ const JOB_LOCK_EXPIRY_IN_MINUTES = 30;
* Locks * Locks
*/ */
const LOCK_DEFAULT_LIMIT = 10; const LOCK_DEFAULT_LIMIT = 10;
const LOCK_DEFULT_TIMEOUT_IN_MINUTES = 10; const LOCK_DEFAULT_TIMEOUT_IN_MINUTES = 10;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment