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

Log exception trace regardless of context.trace option.

Browse Source
This commit is contained in:
abdulmohsen
2024-04-28 19:21:41 +03:00
parent 9059adcb6e
commit 7db51eaa89
19 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Backends/Common/CommonTrait.php
View File

@@ -53,7 +53,7 @@ trait CommonTrait
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
]
],
level: Levels::WARNING,

5
src/Backends/Emby/Action/ParseWebhook.php
View File

@@ -36,6 +36,7 @@ final class ParseWebhook
* @var string $action Action name
*/
protected string $action = 'emby.parseWebhook';
/**
* @var array<string> Supported entity types.
*/
@@ -43,6 +44,7 @@ final class ParseWebhook
EmbyClient::TYPE_MOVIE,
EmbyClient::TYPE_EPISODE,
];
/**
* @var array<string> Supported webhook events.
*/
@@ -56,6 +58,7 @@ final class ParseWebhook
'playback.stop',
'library.new',
];
/**
* @var array<string> Events that should be marked as tainted.
*/
@@ -302,7 +305,7 @@ final class ParseWebhook
'attributes' => $request->getAttributes(),
'payload' => $request->getParsedBody(),
],
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
level: Levels::ERROR
),

6
src/Backends/Emby/Action/Progress.php
View File

@@ -28,7 +28,7 @@ class Progress
/**
* @var int Default time drift in seconds.
*/
private const DEFAULT_TIME_DRIFT = 30;
private const int DEFAULT_TIME_DRIFT = 30;
protected string $action = 'emby.progress';
@@ -226,7 +226,7 @@ class Progress
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -294,7 +294,7 @@ class Progress
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

4
src/Backends/Jellyfin/Action/Backup.php
View File

@@ -23,7 +23,7 @@ use Throwable;
*/
class Backup extends Import
{
private const JSON_FLAGS = JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
private const int JSON_FLAGS = JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
/**
* @var string Action name.
@@ -187,7 +187,7 @@ class Backup extends Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

2
src/Backends/Jellyfin/Action/Export.php
View File

@@ -273,7 +273,7 @@ class Export extends Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

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

@@ -194,7 +194,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
Message::add("{$context->backendName}.has_errors", true);
@@ -206,7 +206,7 @@ class Import
'file' => $e->getFile(),
'line' => $e->getLine(),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
Message::add("{$context->backendName}.has_errors", true);
@@ -228,7 +228,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -302,7 +302,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
continue;
@@ -324,7 +324,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -375,7 +375,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
continue;
@@ -452,7 +452,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -475,7 +475,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -588,7 +588,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -611,7 +611,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -763,7 +763,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -1005,7 +1005,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

8
src/Backends/Jellyfin/Action/ParseWebhook.php
View File

@@ -37,7 +37,7 @@ final class ParseWebhook
/**
* @var array<string> Supported entity types.
*/
protected const WEBHOOK_ALLOWED_TYPES = [
protected const array WEBHOOK_ALLOWED_TYPES = [
JFC::TYPE_MOVIE,
JFC::TYPE_EPISODE,
];
@@ -45,7 +45,7 @@ final class ParseWebhook
/**
* @var array<string> Supported webhook events.
*/
protected const WEBHOOK_ALLOWED_EVENTS = [
protected const array WEBHOOK_ALLOWED_EVENTS = [
'ItemAdded',
'UserDataSaved',
'PlaybackStart',
@@ -55,7 +55,7 @@ final class ParseWebhook
/**
* @var array<string> Events that should be marked as tainted.
*/
protected const WEBHOOK_TAINTED_EVENTS = [
protected const array WEBHOOK_TAINTED_EVENTS = [
'PlaybackStart',
'PlaybackStop',
'ItemAdded',
@@ -258,7 +258,7 @@ final class ParseWebhook
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
'context' => [
'attributes' => $request->getAttributes(),

6
src/Backends/Jellyfin/Action/Progress.php
View File

@@ -33,7 +33,7 @@ class Progress
/**
* @var int Default time drift in seconds.
*/
private const DEFAULT_TIME_DRIFT = 30;
private const int DEFAULT_TIME_DRIFT = 30;
/**
* @var string Action name.
@@ -248,7 +248,7 @@ class Progress
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -316,7 +316,7 @@ class Progress
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

4
src/Backends/Jellyfin/Action/Push.php
View File

@@ -161,7 +161,7 @@ class Push
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -343,7 +343,7 @@ class Push
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

4
src/Backends/Jellyfin/JellyfinGuid.php
View File

@@ -12,7 +12,7 @@ use Throwable;
class JellyfinGuid implements iGuid
{
private const GUID_MAPPER = [
private const array GUID_MAPPER = [
'imdb' => Guid::GUID_IMDB,
'tmdb' => Guid::GUID_TMDB,
'tvdb' => Guid::GUID_TVDB,
@@ -122,7 +122,7 @@ class JellyfinGuid implements iGuid
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $this->context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
...$context,
]

4
src/Backends/Plex/Action/Backup.php
View File

@@ -16,7 +16,7 @@ use Throwable;
final class Backup extends Import
{
private const JSON_FLAGS = JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
private const int JSON_FLAGS = JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
protected function process(
Context $context,
@@ -179,7 +179,7 @@ final class Backup extends Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

2
src/Backends/Plex/Action/Export.php
View File

@@ -258,7 +258,7 @@ final class Export extends Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

2
src/Backends/Plex/Action/GetLibrary.php
View File

@@ -264,7 +264,7 @@ final class GetLibrary
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
...$requestContext,
],

2
src/Backends/Plex/Action/GetUserToken.php
View File

@@ -228,7 +228,7 @@ final class GetUserToken
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
],
level: Levels::ERROR

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

@@ -171,7 +171,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
Message::add("{$context->backendName}.has_errors", true);
@@ -183,7 +183,7 @@ class Import
'file' => $e->getFile(),
'line' => $e->getLine(),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
Message::add("{$context->backendName}.has_errors", true);
@@ -205,7 +205,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -327,7 +327,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
continue;
@@ -349,7 +349,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -402,7 +402,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]);
continue;
@@ -504,7 +504,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -527,7 +527,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -647,7 +647,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -670,7 +670,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -775,7 +775,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -1003,7 +1003,7 @@ class Import
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

8
src/Backends/Plex/Action/ParseWebhook.php
View File

@@ -24,12 +24,12 @@ final class ParseWebhook
use CommonTrait;
use PlexActionTrait;
protected const WEBHOOK_ALLOWED_TYPES = [
protected const array WEBHOOK_ALLOWED_TYPES = [
PlexClient::TYPE_MOVIE,
PlexClient::TYPE_EPISODE,
];
protected const WEBHOOK_ALLOWED_EVENTS = [
protected const array WEBHOOK_ALLOWED_EVENTS = [
'library.new',
'library.on.deck',
'media.play',
@@ -39,7 +39,7 @@ final class ParseWebhook
'media.scrobble',
];
protected const WEBHOOK_TAINTED_EVENTS = [
protected const array WEBHOOK_TAINTED_EVENTS = [
'media.play',
'media.stop',
'media.resume',
@@ -249,7 +249,7 @@ final class ParseWebhook
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
'context' => [
'attributes' => $request->getAttributes(),

4
src/Backends/Plex/Action/Progress.php
View File

@@ -226,7 +226,7 @@ class Progress
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -302,7 +302,7 @@ class Progress
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

4
src/Backends/Plex/Action/Push.php
View File

@@ -127,7 +127,7 @@ final class Push
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);
@@ -320,7 +320,7 @@ final class Push
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
]
);

12
src/Backends/Plex/PlexGuid.php
View File

@@ -15,7 +15,7 @@ final class PlexGuid implements iGuid
/**
* @var array<string,string> Map plex guids to our guids.
*/
private const GUID_MAPPER = [
private const array GUID_MAPPER = [
'imdb' => Guid::GUID_IMDB,
'tmdb' => Guid::GUID_TMDB,
'tvdb' => Guid::GUID_TVDB,
@@ -29,7 +29,7 @@ final class PlexGuid implements iGuid
/**
* @var array<array-key,string> List of legacy plex agents.
*/
private const GUID_LEGACY = [
private const array GUID_LEGACY = [
'com.plexapp.agents.imdb',
'com.plexapp.agents.tmdb',
'com.plexapp.agents.themoviedb',
@@ -44,7 +44,7 @@ final class PlexGuid implements iGuid
/**
* @var array<array-key,string> List of local plex agents.
*/
private const GUID_LOCAL = [
private const array GUID_LOCAL = [
'plex',
'local',
'com.plexapp.agents.none',
@@ -53,7 +53,7 @@ final class PlexGuid implements iGuid
/**
* @var array<string,string> Map guids to their replacement.
*/
private const GUID_LEGACY_REPLACER = [
private const array GUID_LEGACY_REPLACER = [
'com.plexapp.agents.themoviedb://' => 'com.plexapp.agents.tmdb://',
'com.plexapp.agents.xbmcnfotv://' => 'com.plexapp.agents.tvdb://',
'com.plexapp.agents.thetvdb://' => 'com.plexapp.agents.tvdb://',
@@ -238,7 +238,7 @@ final class PlexGuid implements iGuid
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $this->context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
...$context,
]
@@ -309,7 +309,7 @@ final class PlexGuid implements iGuid
'line' => $e->getLine(),
'kind' => get_class($e),
'message' => $e->getMessage(),
'trace' => $this->context->trace ? $e->getTrace() : [],
'trace' => $e->getTrace(),
],
...$context,
]