danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Probably improve error handling in strands

Browse Source
This commit is contained in:
Daniil Gentili 2019-06-04 15:06:47 +02:00
parent 5b51d71257
commit 541f9b67ac
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/danog/MadelineProto/API.php
View File

@ -167,6 +167,8 @@ class API extends APIFactory
$this->init(); $this->init();
} }
$this->API->logger('Shutting down MadelineProto (normally or due to an exception, idk)'); $this->API->logger('Shutting down MadelineProto (normally or due to an exception, idk)');
$this->API->destructing = true;
$this->destructing = true;
$this->wait($this->serialize()); $this->wait($this->serialize());
//restore_error_handler(); //restore_error_handler();
} }

3
src/danog/MadelineProto/Tools.php
View File

@ -300,10 +300,11 @@ trait Tools
$logger->logger("Got the following exception within a forked strand$file, trying to rethrow"); $logger->logger("Got the following exception within a forked strand$file, trying to rethrow");
if ($e->getMessage() === "Cannot get return value of a generator that hasn't returned") { if ($e->getMessage() === "Cannot get return value of a generator that hasn't returned") {
$logger->logger("Well you know, this might actually not be the actual exception, scroll up in the logs to see the actual exception"); $logger->logger("Well you know, this might actually not be the actual exception, scroll up in the logs to see the actual exception");
if (!isset($this->destructing)) Promise\rethrow(new Failure($e));
} else { } else {
$logger->logger($e); $logger->logger($e);
Promise\rethrow(new Failure($e));
} }
Promise\rethrow(new Failure($e));
} }
public function after($a, $b) public function after($a, $b)