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

Mysql errors catch

Browse Source
This commit is contained in:
Alexander Pankratov 2020-05-03 17:04:30 +03:00
parent 0c59e6ef42
commit ae9edd5512
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/danog/MadelineProto/Db/MysqlArray.php
View File

@ -7,6 +7,7 @@ use Amp\Mysql\Pool;
use Amp\Producer; use Amp\Producer;
use Amp\Promise; use Amp\Promise;
use Amp\Sql\ResultSet; use Amp\Sql\ResultSet;
use danog\MadelineProto\Exception;
use danog\MadelineProto\Logger; use danog\MadelineProto\Logger;
use function Amp\call; use function Amp\call;
use function Amp\Promise\wait; use function Amp\Promise\wait;
@ -49,7 +50,7 @@ class MysqlArray implements DbArray
$instance->db = static::getDbConnection($settings); $instance->db = static::getDbConnection($settings);
$instance->ttl = $settings['cache_ttl'] ?? $instance->ttl; $instance->ttl = $settings['cache_ttl'] ?? $instance->ttl;
if ($value instanceof static) { if ($value instanceof static && $value->table) {
if ( if (
mb_strpos($value->table, 'tmp') === 0 && mb_strpos($value->table, 'tmp') === 0 &&
mb_strpos($instance->table, 'tmp') !== 0 mb_strpos($instance->table, 'tmp') !== 0
@ -270,22 +271,12 @@ class MysqlArray implements DbArray
private function renameTable(string $from, string $to) private function renameTable(string $from, string $to)
{ {
try { $this->syncRequest("
$this->syncRequest(" ALTER TABLE {$from} RENAME TO {$to};
ALTER TABLE {$from} RENAME TO {$to}; ");
"); $this->syncRequest("
} catch (\Throwable $e) { DROP TABLE IF EXISTS {$from};
Logger::log("Cant rename table {$from} to {$to}", Logger::WARNING); ");
try {
$this->syncRequest("
DROP TABLE {$from};
");
} catch (\Throwable $e) {
Logger::log("Cant drop table {$from}", Logger::WARNING);
}
}
} }
/** /**
@ -318,7 +309,13 @@ class MysqlArray implements DbArray
return []; return [];
} }
$request = yield $this->db->execute($query, $params); try {
$request = yield $this->db->execute($query, $params);
} catch (\Throwable $e) {
Logger::log($e, Logger::ERROR);
return [];
}
$result = []; $result = [];
if ($request instanceof ResultSet) { if ($request instanceof ResultSet) {
while (yield $request->advance()) { while (yield $request->advance()) {