Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-07 18:44:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Warning handler removed

Browse source
This commit is contained in:
Michael 2025-06-01 04:27:52 +00:00
parent 3883bdf96f
commit 497798b455
1 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Protocol/ATProtocol/Jetstream.php
View file

@ -94,34 +94,20 @@ class Jetstream
$this->syncContacts(); $this->syncContacts();
try { try {
set_error_handler(function ($errno, $errstr, $errfile, $errline) {
restore_error_handler();
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
}, E_WARNING);
// @todo make the path configurable // @todo make the path configurable
$this->client = new \WebSocket\Client('wss://jetstream1.us-west.bsky.network/subscribe?requireHello=true' . $cursor); $this->client = new \WebSocket\Client('wss://jetstream1.us-west.bsky.network/subscribe?requireHello=true' . $cursor);
$this->client->setTimeout($timeout); $this->client->setTimeout($timeout);
$this->client->setLogger($this->logger); $this->client->setLogger($this->logger);
restore_error_handler();
} catch (\WebSocket\ConnectionException $e) { } catch (\WebSocket\ConnectionException $e) {
$this->logger->error('Error while trying to establish the connection', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]); $this->logger->error('Error while trying to establish the connection', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
echo "Connection wasn't established.\n"; echo "Connection wasn't established.\n";
exit(1); exit(1);
} catch (\ErrorException $e) {
$this->logger->notice('Warning while trying to establish the connection', ['code' => $e->getCode(), 'severity' => $e->getSeverity(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
echo "Connection wasn't established.\n";
exit(1);
} }
$this->setOptions(); $this->setOptions();
$last_timeout = time(); $last_timeout = time();
while (true) { while (true) {
try { try {
set_error_handler(function ($errno, $errstr, $errfile, $errline) {
restore_error_handler();
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
}, E_WARNING);
$message = $this->client->receive(); $message = $this->client->receive();
restore_error_handler();
if (empty($message)) { if (empty($message)) {
$this->logger->notice('Empty message received'); $this->logger->notice('Empty message received');
@ -150,23 +136,13 @@ class Jetstream
$this->logger->error('Error while trying to receive a message', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]); $this->logger->error('Error while trying to receive a message', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
break; break;
} }
} catch (\ErrorException $e) {
$this->logger->notice('Warning while trying to receive a message', ['code' => $e->getCode(), 'severity' => $e->getSeverity(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
break;
} }
$last_timeout = time(); $last_timeout = time();
} }
try { try {
set_error_handler(function ($errno, $errstr, $errfile, $errline) {
restore_error_handler();
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
}, E_WARNING);
$this->client->close(); $this->client->close();
restore_error_handler();
} catch (\WebSocket\ConnectionException $e) { } catch (\WebSocket\ConnectionException $e) {
$this->logger->error('Error while trying to close the connection', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]); $this->logger->error('Error while trying to close the connection', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
} catch (\ErrorException $e) {
$this->logger->notice('Warning while trying to close the connection', ['code' => $e->getCode(), 'severity' => $e->getSeverity(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
} }
} }
$this->logger->notice('Stop listening'); $this->logger->notice('Stop listening');
@ -263,16 +239,9 @@ class Jetstream
] ]
]; ];
try { try {
set_error_handler(function ($errno, $errstr, $errfile, $errline) {
restore_error_handler();
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
}, E_WARNING);
$this->client->send(json_encode($update)); $this->client->send(json_encode($update));
restore_error_handler();
} catch (\WebSocket\ConnectionException $e) { } catch (\WebSocket\ConnectionException $e) {
$this->logger->error('Error while trying to send options.', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]); $this->logger->error('Error while trying to send options.', ['code' => $e->getCode(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
} catch (\ErrorException $e) {
$this->logger->notice('Warning while trying to send options.', ['code' => $e->getCode(), 'severity' => $e->getSeverity(), 'message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()]);
} }
} }