nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5734 from nupplaphil/friendica-5716-followup

Browse source 
LockDriverFixings
This commit is contained in:
Hypolite Petovan 2018-09-06 11:50:47 -04:00 committed by GitHub
commit 68c6895e1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Core/Cache/ArrayCache.php
View file

@ -53,6 +53,11 @@ class ArrayCache extends AbstractCacheDriver implements IMemoryCacheDriver
*/
public function clear($outdated = true)
{
// Array doesn't support TTL so just don't delete something
if ($outdated) {
return true;
}
$this->cachedData = [];
return true;
}

2
src/Core/Worker.php
View file

@ -117,12 +117,14 @@ class Worker
// Count active workers and compare them with a maximum value that depends on the load
if (self::tooMuchWorkers()) {
logger('Active worker limit reached, quitting.', LOGGER_DEBUG);
Lock::release('worker');
return;
}
// Check free memory
if ($a->min_memory_reached()) {
logger('Memory limit reached, quitting.', LOGGER_DEBUG);
Lock::release('worker');
return;
}
Lock::release('worker');

1
src/Model/Item.php
View file

@ -1936,6 +1936,7 @@ class Item extends BaseObject
} else {
// This shouldn't happen.
logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
Lock::release('item_insert_activity');
return false;
}
if ($locked) {

24
tests/src/Core/Cache/CacheTest.php
View file

@ -81,19 +81,33 @@ abstract class CacheTest extends DatabaseTest
'3_value1' => $this->instance->get('3_value1'),
]);
$this->assertTrue($this->instance->clear(false));
$this->assertTrue($this->instance->clear());
$this->assertEquals([
'1_value1' => null,
'1_value2' => null,
'2_value1' => null,
'3_value1' => null,
'1_value1' => 'ipsum lorum1',
'1_value2' => 'ipsum lorum2',
'2_value1' => 'ipsum lorum3',
'3_value1' => 'ipsum lorum4',
], [
'1_value1' => $this->instance->get('1_value1'),
'1_value2' => $this->instance->get('1_value2'),
'2_value1' => $this->instance->get('2_value1'),
'3_value1' => $this->instance->get('3_value1'),
]);
$this->assertTrue($this->instance->clear(false));
$this->assertEquals([
'1_value1' => null,
'1_value2' => null,
'2_value3' => null,
'3_value4' => null,
], [
'1_value1' => $this->instance->get('1_value1'),
'1_value2' => $this->instance->get('1_value2'),
'2_value3' => $this->instance->get('2_value3'),
'3_value4' => $this->instance->get('3_value4'),
]);
}
/**