| Index: trunk/extensions/ExtensionDistributor/svn-invoker.php |
| — | — | @@ -65,16 +65,12 @@ |
| 66 | 66 | svnError( 'extdist-remote-error', "Unable to open lock file." ); |
| 67 | 67 | return; |
| 68 | 68 | } |
| 69 | | - $timeout = 20; |
| | 69 | + $timeout = 3; |
| 70 | 70 | for ( $i = 0; $i < $timeout; $i++ ) { |
| 71 | 71 | $wouldBlock = false; |
| 72 | 72 | if ( flock( $lockFile, LOCK_EX | LOCK_NB ) ) { |
| 73 | 73 | break; |
| 74 | 74 | } |
| 75 | | - if ( !$wouldBlock ) { |
| 76 | | - svnError( 'extdist-remote-error', "Error attempting to obtain lock." ); |
| 77 | | - return; |
| 78 | | - } |
| 79 | 75 | sleep( 1 ); |
| 80 | 76 | } |
| 81 | 77 | if ( $i == $timeout ) { |
| Property changes on: trunk/extensions/ExtensionDistributor |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 82 | 78 | Merged /branches/wmf/1.18wmf1/extensions/ExtensionDistributor:r102502 |