devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2915 from wallabag/import-drop-msg-user-null 

Import: we now skip messages when user is null
This commit is contained in:
Nicolas Lœuillet 2017-02-20 09:45:12 +01:00 committed by GitHub
parent 48be826ea9 b45b6b6707
commit 6914fdd8d8
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Wallabag/ImportBundle/Consumer/AbstractConsumer.php
View File

@ -46,7 +46,8 @@ abstract class AbstractConsumer
if (null === $user) { if (null === $user) {
$this->logger->warning('Unable to retrieve user', ['entry' => $storedEntry]); $this->logger->warning('Unable to retrieve user', ['entry' => $storedEntry]);
return false; // return true to skip message
return true;
} }
$this->import->setUser($user); $this->import->setUser($user);

4
tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
View File

@ -183,7 +183,9 @@ JSON;
$message = new AMQPMessage($body); $message = new AMQPMessage($body);
$consumer->execute($message); $res = $consumer->execute($message);
$this->assertTrue($res);
} }
public function testMessageWithEntryProcessed() public function testMessageWithEntryProcessed()

2
tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php
View File

@ -182,7 +182,7 @@ JSON;
$res = $consumer->manage($body); $res = $consumer->manage($body);
$this->assertFalse($res); $this->assertTrue($res);
} }
public function testMessageWithEntryProcessed() public function testMessageWithEntryProcessed()