Skip to content

Commit 52d20a3

Browse files
arabcodersarabcoders
authored
Merge pull request #379 from ArabCoders/dev
Dev
2 parents a8db9e4 + 8d9ae2a commit 52d20a3

25 files changed

+386
-100
lines changed

‎src/Backends/Common/CommonTrait.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,18 @@ protected function tryResponse(Context $context, callable $fn, string|null $acti
3333
return new Response(
3434
status: false,
3535
error: new Error(
36-
message: 'Unhandled exception was thrown in [{client}: {backend}] {action}. {message}',
36+
message: 'Exception [{error.kind}] was thrown unhandled in [{client}: {backend}] {action}. Error [{error.message} @ {error.file}:{error.line}].',
3737
context: [
3838
'action' => $action ?? 'context',
3939
'backend' => $context->backendName,
4040
'client' => $context->clientName,
4141
'message' => $e->getMessage(),
42+
'error' => [
43+
'kind' => $e::class,
44+
'line' => $e->getLine(),
45+
'message' => $e->getMessage(),
46+
'file' => after($e->getFile(), ROOT_PATH),
47+
],
4248
'exception' => [
4349
'file' => $e->getFile(),
4450
'line' => $e->getLine(),

‎src/Backends/Emby/Action/ParseWebhook.php

+8-1
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,16 @@ private function parse(Context $context, iGuid $guid, iRequest $request): Respon
232232
return new Response(
233233
status: false,
234234
error: new Error(
235-
message: 'Unhandled exception was thrown during [{backend}] webhook event parsing.',
235+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] webhook event parsing. Error [{error.message} @ {error.file}:{error.line}].',
236236
context: [
237237
'backend' => $context->backendName,
238+
'client' => $context->clientName,
239+
'error' => [
240+
'kind' => $e::class,
241+
'line' => $e->getLine(),
242+
'message' => $e->getMessage(),
243+
'file' => after($e->getFile(), ROOT_PATH),
244+
],
238245
'exception' => [
239246
'file' => $e->getFile(),
240247
'line' => $e->getLine(),

‎src/Backends/Emby/Action/Progress.php

+18-4
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,17 @@ private function action(
157157
}
158158
} catch (\RuntimeException $e) {
159159
$this->logger->error(
160-
'Unhandled exception was thrown during request to get [{backend}] {item.type} [{item.title}] status.',
161-
[
160+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] get {item.type} [{item.title}] status. Error [{error.message} @ {error.file}:{error.line}].',
161+
contexT: [
162162
'backend' => $context->backendName,
163+
'client' => $context->clientName,
163164
...$logContext,
165+
'error' => [
166+
'kind' => $e::class,
167+
'line' => $e->getLine(),
168+
'message' => $e->getMessage(),
169+
'file' => after($e->getFile(), ROOT_PATH),
170+
],
164171
'exception' => [
165172
'file' => $e->getFile(),
166173
'line' => $e->getLine(),
@@ -213,9 +220,16 @@ private function action(
213220
}
214221
} catch (Throwable $e) {
215222
$this->logger->error(
216-
'Unhandled exception was thrown during request to change [{backend}] {item.type} [{item.title}] watch progress.',
217-
[
223+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] change {item.type} [{item.title}] watch progress. Error [{error.message} @ {error.file}:{error.line}].',
224+
context: [
218225
'backend' => $context->backendName,
226+
'client' => $context->clientName,
227+
'error' => [
228+
'kind' => $e::class,
229+
'line' => $e->getLine(),
230+
'message' => $e->getMessage(),
231+
'file' => after($e->getFile(), ROOT_PATH),
232+
],
219233
...$logContext,
220234
'exception' => [
221235
'file' => $e->getFile(),

‎src/Backends/Jellyfin/Action/Backup.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,16 @@ protected function process(
145145
}
146146
} catch (Throwable $e) {
147147
$this->logger->error(
148-
'Unhandled exception was thrown during handling of [{backend}] [{library.title}] [{item.title}] backup.',
149-
[
148+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] backup. Error [{error.message} @ {error.file}:{error.line}].',
149+
context: [
150150
'backend' => $context->backendName,
151+
'client' => $context->clientName,
152+
'error' => [
153+
'kind' => $e::class,
154+
'line' => $e->getLine(),
155+
'message' => $e->getMessage(),
156+
'file' => after($e->getFile(), ROOT_PATH),
157+
],
151158
...$logContext,
152159
'exception' => [
153160
'file' => $e->getFile(),

‎src/Backends/Jellyfin/Action/Export.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,16 @@ protected function process(
237237
);
238238
} catch (Throwable $e) {
239239
$this->logger->error(
240-
'Unhandled exception was thrown during handling of [{backend}] [{library.title}] [{item.title}] export.',
241-
[
240+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] export. Error [{error.message} @ {error.file}:{error.line}].',
241+
context: [
242242
'backend' => $context->backendName,
243+
'client' => $context->clientName,
244+
'error' => [
245+
'kind' => $e::class,
246+
'line' => $e->getLine(),
247+
'message' => $e->getMessage(),
248+
'file' => after($e->getFile(), ROOT_PATH),
249+
],
243250
...$logContext,
244251
'exception' => [
245252
'file' => $e->getFile(),

‎src/Backends/Jellyfin/Action/Import.php

+67-22
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,16 @@ public function __invoke(
7171
logContext: $logContext
7272
),
7373
error: fn(array $logContext = []) => fn(Throwable $e) => $this->logger->error(
74-
'Unhandled Exception was thrown during [{backend}] library [{library.title}] request.',
75-
[
74+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] library [{library.title}] request. Error [{error.message} @ {error.file}:{error.line}].',
75+
context: [
7676
'backend' => $context->backendName,
77+
'client' => $context->clientName,
78+
'error' => [
79+
'kind' => $e::class,
80+
'line' => $e->getLine(),
81+
'message' => $e->getMessage(),
82+
'file' => after($e->getFile(), ROOT_PATH),
83+
],
7784
...$logContext,
7885
'exception' => [
7986
'file' => $e->getFile(),
@@ -171,16 +178,26 @@ protected function getLibraries(Context $context, Closure $handle, Closure $erro
171178
Message::add("{$context->backendName}.has_errors", true);
172179
return [];
173180
} catch (Throwable $e) {
174-
$this->logger->error('Unhandled exception was thrown during request for [{backend}] libraries.', [
175-
'backend' => $context->backendName,
176-
'exception' => [
177-
'file' => $e->getFile(),
178-
'line' => $e->getLine(),
179-
'kind' => get_class($e),
180-
'message' => $e->getMessage(),
181-
'trace' => $context->trace ? $e->getTrace() : [],
182-
],
183-
]);
181+
$this->logger->error(
182+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] request for libraries. Error [{error.message} @ {error.file}:{error.line}].',
183+
context: [
184+
'backend' => $context->backendName,
185+
'client' => $context->clientName,
186+
'error' => [
187+
'kind' => $e::class,
188+
'line' => $e->getLine(),
189+
'message' => $e->getMessage(),
190+
'file' => after($e->getFile(), ROOT_PATH),
191+
],
192+
'exception' => [
193+
'file' => $e->getFile(),
194+
'line' => $e->getLine(),
195+
'kind' => get_class($e),
196+
'message' => $e->getMessage(),
197+
'trace' => $context->trace ? $e->getTrace() : [],
198+
],
199+
]
200+
);
184201
Message::add("{$context->backendName}.has_errors", true);
185202
return [];
186203
}
@@ -257,9 +274,16 @@ protected function getLibraries(Context $context, Closure $handle, Closure $erro
257274
continue;
258275
} catch (Throwable $e) {
259276
$this->logger->error(
260-
'Unhandled exception was thrown during [{backend}] [{library.title}] items count request.',
261-
[
277+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] [{library.title}] items count request. Error [{error.message} @ {error.file}:{error.line}].',
278+
context: [
262279
'backend' => $context->backendName,
280+
'client' => $context->clientName,
281+
'error' => [
282+
'kind' => $e::class,
283+
'line' => $e->getLine(),
284+
'message' => $e->getMessage(),
285+
'file' => after($e->getFile(), ROOT_PATH),
286+
],
263287
...$logContext,
264288
'exception' => [
265289
'file' => $e->getFile(),
@@ -401,9 +425,16 @@ protected function getLibraries(Context $context, Closure $handle, Closure $erro
401425
continue;
402426
} catch (Throwable $e) {
403427
$this->logger->error(
404-
'Unhandled exception was thrown during [{backend}] [{library.title}] series external ids request.',
405-
[
428+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] [{library.title}] series external ids request. Error [{error.message} @ {error.file}:{error.line}].',
429+
context: [
406430
'backend' => $context->backendName,
431+
'client' => $context->clientName,
432+
'error' => [
433+
'kind' => $e::class,
434+
'line' => $e->getLine(),
435+
'message' => $e->getMessage(),
436+
'file' => after($e->getFile(), ROOT_PATH),
437+
],
407438
...$logContext,
408439
'exception' => [
409440
'file' => $e->getFile(),
@@ -530,9 +561,16 @@ protected function getLibraries(Context $context, Closure $handle, Closure $erro
530561
continue;
531562
} catch (Throwable $e) {
532563
$this->logger->error(
533-
'Unhandled exception was thrown during [{backend}] [{library.title}] [{segment.number}/{segment.of}] content list request.',
534-
[
564+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] [{library.title}] [{segment.number}/{segment.of}] content list request. Error [{error.message} @ {error.file}:{error.line}].',
565+
context: [
535566
'backend' => $context->backendName,
567+
'client' => $context->clientName,
568+
'error' => [
569+
'kind' => $e::class,
570+
'line' => $e->getLine(),
571+
'message' => $e->getMessage(),
572+
'file' => after($e->getFile(), ROOT_PATH),
573+
],
536574
...$logContext,
537575
'exception' => [
538576
'file' => $e->getFile(),
@@ -636,8 +674,8 @@ protected function handle(Context $context, iResponse $response, Closure $callba
636674
}
637675
} catch (Throwable $e) {
638676
$this->logger->error(
639-
'Unhandled exception was thrown during parsing of [{backend}] library [{library.title}] [{segment.number}/{segment.of}] response.',
640-
[
677+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] parsing [{library.title}] [{segment.number}/{segment.of}] response. Error [{error.message} @ {error.file}:{error.line}].',
678+
context: [
641679
'backend' => $context->backendName,
642680
...$logContext,
643681
'exception' => [
@@ -851,9 +889,16 @@ protected function process(
851889
]);
852890
} catch (Throwable $e) {
853891
$this->logger->error(
854-
'Unhandled exception was thrown during handling of [{backend}] [{library.title}] [{item.title}] import.',
855-
[
892+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] [{library.title}] [{item.title}] import. Error [{error.message} @ {error.file}:{error.line}].',
893+
context: [
856894
'backend' => $context->backendName,
895+
'client' => $context->clientName,
896+
'error' => [
897+
'kind' => $e::class,
898+
'line' => $e->getLine(),
899+
'message' => $e->getMessage(),
900+
'file' => after($e->getFile(), ROOT_PATH),
901+
],
857902
...$logContext,
858903
'exception' => [
859904
'file' => $e->getFile(),

‎src/Backends/Jellyfin/Action/ParseWebhook.php

+8-1
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,16 @@ private function parse(Context $context, iGuid $guid, iRequest $request): Respon
216216
return new Response(
217217
status: false,
218218
error: new Error(
219-
message: 'Unhandled exception was thrown during [{backend}] webhook event parsing.',
219+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] webhook event parsing. Error [{error.message} @ {error.file}:{error.line}].',
220220
context: [
221221
'backend' => $context->backendName,
222+
'client' => $context->clientName,
223+
'error' => [
224+
'kind' => $e::class,
225+
'line' => $e->getLine(),
226+
'message' => $e->getMessage(),
227+
'file' => after($e->getFile(), ROOT_PATH),
228+
],
222229
'exception' => [
223230
'file' => $e->getFile(),
224231
'line' => $e->getLine(),

‎src/Backends/Jellyfin/Action/Progress.php

+18-4
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,16 @@ private function action(
157157
}
158158
} catch (\RuntimeException $e) {
159159
$this->logger->error(
160-
'Unhandled exception was thrown during request to get [{backend}] {item.type} [{item.title}] status.',
161-
[
160+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] get {item.type} [{item.title}] status. Error [{error.message} @ {error.file}:{error.line}].',
161+
context: [
162162
'backend' => $context->backendName,
163+
'client' => $context->clientName,
164+
'error' => [
165+
'kind' => $e::class,
166+
'line' => $e->getLine(),
167+
'message' => $e->getMessage(),
168+
'file' => after($e->getFile(), ROOT_PATH),
169+
],
163170
...$logContext,
164171
'exception' => [
165172
'file' => $e->getFile(),
@@ -210,9 +217,16 @@ private function action(
210217
}
211218
} catch (Throwable $e) {
212219
$this->logger->error(
213-
'Unhandled exception was thrown during request to change [{backend}] {item.type} [{item.title}] watch progress.',
214-
[
220+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] change {item.type} [{item.title}] watch progress. Error [{error.message} @ {error.file}:{error.line}].',
221+
context: [
215222
'backend' => $context->backendName,
223+
'client' => $context->clientName,
224+
'error' => [
225+
'kind' => $e::class,
226+
'line' => $e->getLine(),
227+
'message' => $e->getMessage(),
228+
'file' => after($e->getFile(), ROOT_PATH),
229+
],
216230
...$logContext,
217231
'exception' => [
218232
'file' => $e->getFile(),

‎src/Backends/Jellyfin/Action/Push.php

+18-4
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,16 @@ private function action(
118118
);
119119
} catch (Throwable $e) {
120120
$this->logger->error(
121-
'Unhandled exception was thrown during request for [{backend}] {item.type} [{item.title}] metadata.',
122-
[
121+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] request for {item.type} [{item.title}] metadata. Error [{error.message} @ {error.file}:{error.line}].',
122+
context: [
123123
'backend' => $context->backendName,
124+
'client' => $context->clientName,
125+
'error' => [
126+
'kind' => $e::class,
127+
'line' => $e->getLine(),
128+
'message' => $e->getMessage(),
129+
'file' => after($e->getFile(), ROOT_PATH),
130+
],
124131
...$logContext,
125132
'exception' => [
126133
'file' => $e->getFile(),
@@ -293,9 +300,16 @@ private function action(
293300
}
294301
} catch (Throwable $e) {
295302
$this->logger->error(
296-
'Unhandled exception was thrown during handling of [{backend}] {item.type} [{item.title}].',
297-
[
303+
message: 'Exception [{error.kind}] was thrown unhandled during [{client}: {backend}] parsing [{library.title}] [{segment.number}/{segment.of}] response. Error [{error.message} @ {error.file}:{error.line}].',
304+
context: [
298305
'backend' => $context->backendName,
306+
'client' => $context->clientName,
307+
'error' => [
308+
'kind' => $e::class,
309+
'line' => $e->getLine(),
310+
'message' => $e->getMessage(),
311+
'file' => after($e->getFile(), ROOT_PATH),
312+
],
299313
...$logContext,
300314
'exception' => [
301315
'file' => $e->getFile(),

0 commit comments

Comments
 (0)