Skip to content

Also handle untyped TaskAbortedException in pub_worker. #8588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

Also handle untyped TaskAbortedException in pub_worker. #8588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions pkg/pub_worker/lib/src/analyze.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import 'dart:isolate' show Isolate;

import 'package:_pub_shared/data/task_payload.dart';
import 'package:_pub_shared/pubapi.dart';
import 'package:api_builder/api_builder.dart';
import 'package:clock/clock.dart' show clock;
import 'package:http/http.dart' show Client, ClientException;
import 'package:indexed_blob/indexed_blob.dart';
Expand Down Expand Up @@ -67,6 +68,18 @@ Future<void> analyze(Payload payload) async {
client: client.withAuthorization(() => p.token),
);

void warnTaskAborted(Exception e, StackTrace st) {
_log.warning(
'Task was aborted when uploading ${payload.package} / ${p.version}',
e,
st);
}

void shoutTaskError(Object e, StackTrace st) {
_log.shout(
'failed to process ${payload.package} / ${p.version}', e, st);
}

try {
// Skip analysis, if we're past the worker deadline
if (clock.now().isBefore(workerDeadline)) {
Expand All @@ -93,13 +106,15 @@ Future<void> analyze(Payload payload) async {
);
}
} on TaskAbortedException catch (e, st) {
_log.warning(
'Task was aborted when uploading ${payload.package} / ${p.version}',
e,
st);
warnTaskAborted(e, st);
} on ApiResponseException catch (e, st) {
if (e.status == 400 && e.code == 'TaskAborted') {
warnTaskAborted(e, st);
} else {
shoutTaskError(e, st);
}
} catch (e, st) {
_log.shout(
'failed to process ${payload.package} / ${p.version}', e, st);
shoutTaskError(e, st);
}
}
} finally {
Expand Down
Loading