cphipps/watchstate
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

updated last remaining exception catchers without trace support.

Browse Source
This commit is contained in:
Abdulmhsen B. A. A
2022-06-27 17:11:50 +03:00
parent 36b8380517
commit dd7e79f515
5 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Backends/Jellyfin/Action/Import.php
View File

@@ -139,6 +139,7 @@ class Import
return [];
} catch (JsonException $e) {
$this->logger->error('Request for [%(backend)] libraries returned with invalid body.', [
'backend' => $context->backendName,
'exception' => [
'file' => $e->getFile(),
'line' => $e->getLine(),

1
src/Backends/Plex/Action/Import.php
View File

@@ -140,6 +140,7 @@ class Import
return [];
} catch (JsonException $e) {
$this->logger->error('Request for [%(backend)] libraries returned with invalid body.', [
'backend' => $context->backendName,
'exception' => [
'file' => $e->getFile(),
'line' => $e->getLine(),

1
src/Commands/State/PushCommand.php
View File

@@ -199,6 +199,7 @@ class PushCommand extends Command
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $e->getTrace(),
],
]
);

2
src/Libs/Initializer.php
View File

@@ -157,6 +157,7 @@ final class Initializer
'file' => $e->getFile(),
'line' => $e->getLine(),
'kind' => get_class($e),
'trace' => $e->getTrace(),
]
);
$response = new Response(500);
@@ -206,6 +207,7 @@ final class Initializer
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $e->getTrace(),
]
]);
continue;

44
src/Libs/Storage/PDO/PDOAdapter.php
View File

@@ -95,7 +95,15 @@ final class PDOAdapter implements StorageInterface
} catch (PDOException $e) {
$this->stmt['insert'] = null;
if (false === $this->viaTransaction && false === $this->singleTransaction) {
$this->logger->error($e->getMessage(), $entity->getAll());
$this->logger->error($e->getMessage(), [
'entity' => $entity->getAll(),
'exception' => [
'file' => $e->getFile(),
'line' => $e->getLine(),
'message' => $e->getMessage(),
'trace' => $e->getTrace(),
],
]);
return $entity;
}
throw $e;
@@ -241,7 +249,15 @@ final class PDOAdapter implements StorageInterface
} catch (PDOException $e) {
$this->stmt['update'] = null;
if (false === $this->viaTransaction && false === $this->singleTransaction) {
$this->logger->error($e->getMessage(), $entity->getAll());
$this->logger->error($e->getMessage(), [
'entity' => $entity->getAll(),
'exception' => [
'file' => $e->getFile(),
'line' => $e->getLine(),
'message' => $e->getMessage(),
'trace' => $e->getTrace(),
]
]);
return $entity;
}
throw $e;
@@ -268,7 +284,15 @@ final class PDOAdapter implements StorageInterface
$this->query(sprintf('DELETE FROM state WHERE %s = %d', iFace::COLUMN_ID, (int)$id));
} catch (PDOException $e) {
$this->logger->error($e->getMessage());
$this->logger->error($e->getMessage(), [
'entity' => $entity->getAll(),
'exception' => [
'file' => $e->getFile(),
'line' => $e->getLine(),
'message' => $e->getMessage(),
'trace' => $e->getTrace(),
],
]);
return false;
}
@@ -295,7 +319,15 @@ final class PDOAdapter implements StorageInterface
}
} catch (PDOException $e) {
$actions['failed']++;
$this->logger->error($e->getMessage(), $entity->getAll());
$this->logger->error($e->getMessage(), [
'entity' => $entity->getAll(),
'exception' => [
'file' => $e->getFile(),
'line' => $e->getLine(),
'message' => $e->getMessage(),
'trace' => $e->getTrace(),
],
]);
}
}
@@ -519,7 +551,7 @@ final class PDOAdapter implements StorageInterface
try {
return $stmt->execute($cond);
} catch (PDOException $e) {
if (false !== stripos($e->getMessage(), 'database is locked')) {
if (true === str_contains(strtolower($e->getMessage()), 'database is locked')) {
if ($i >= self::LOCK_RETRY) {
throw $e;
}
@@ -545,7 +577,7 @@ final class PDOAdapter implements StorageInterface
try {
return $this->pdo->query($sql);
} catch (PDOException $e) {
if (false !== stripos($e->getMessage(), 'database is locked')) {
if (true === str_contains(strtolower($e->getMessage()), 'database is locked')) {
if ($i >= self::LOCK_RETRY) {
throw $e;
}