Skip to content

Commit afa26cf

Browse files
Dillon Nysdnys1
authored andcommitted
chore(worker_bee): Use AWSLogger for logging
commit-id:4d0b5dc5
1 parent 3739bf5 commit afa26cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+15647
-15605
lines changed

packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.vm.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import 'package:worker_bee/worker_bee.dart';
88

99
Future<void> _run(SendPorts ports) async {
1010
final channel = IsolateChannel<Object?>.connectSend(ports.messagePort);
11-
final logsChannel = IsolateChannel<LogMessage>.connectSend(ports.logPort);
11+
final logsChannel = IsolateChannel<LogEntry>.connectSend(ports.logPort);
1212
final worker = ConfirmDeviceWorkerImpl();
1313
await worker.connect(logsChannel: logsChannel);
1414
final result = await worker.run(
1515
channel.stream.asBroadcastStream().cast(),
1616
channel.sink.cast(),
1717
);
1818
// ignore: invalid_use_of_protected_member
19-
worker.logger.finest('Finished');
19+
worker.logger.verbose('Finished');
2020
unawaited(worker.close());
2121
Isolate.exit(ports.donePort, result);
2222
}

packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.vm.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import 'package:worker_bee/worker_bee.dart';
88

99
Future<void> _run(SendPorts ports) async {
1010
final channel = IsolateChannel<Object?>.connectSend(ports.messagePort);
11-
final logsChannel = IsolateChannel<LogMessage>.connectSend(ports.logPort);
11+
final logsChannel = IsolateChannel<LogEntry>.connectSend(ports.logPort);
1212
final worker = SrpDevicePasswordVerifierWorkerImpl();
1313
await worker.connect(logsChannel: logsChannel);
1414
final result = await worker.run(
1515
channel.stream.asBroadcastStream().cast(),
1616
channel.sink.cast(),
1717
);
1818
// ignore: invalid_use_of_protected_member
19-
worker.logger.finest('Finished');
19+
worker.logger.verbose('Finished');
2020
unawaited(worker.close());
2121
Isolate.exit(ports.donePort, result);
2222
}

packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.vm.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import 'package:worker_bee/worker_bee.dart';
88

99
Future<void> _run(SendPorts ports) async {
1010
final channel = IsolateChannel<Object?>.connectSend(ports.messagePort);
11-
final logsChannel = IsolateChannel<LogMessage>.connectSend(ports.logPort);
11+
final logsChannel = IsolateChannel<LogEntry>.connectSend(ports.logPort);
1212
final worker = SrpInitWorkerImpl();
1313
await worker.connect(logsChannel: logsChannel);
1414
final result = await worker.run(
1515
channel.stream.asBroadcastStream().cast(),
1616
channel.sink.cast(),
1717
);
1818
// ignore: invalid_use_of_protected_member
19-
worker.logger.finest('Finished');
19+
worker.logger.verbose('Finished');
2020
unawaited(worker.close());
2121
Isolate.exit(ports.donePort, result);
2222
}

packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.vm.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import 'package:worker_bee/worker_bee.dart';
88

99
Future<void> _run(SendPorts ports) async {
1010
final channel = IsolateChannel<Object?>.connectSend(ports.messagePort);
11-
final logsChannel = IsolateChannel<LogMessage>.connectSend(ports.logPort);
11+
final logsChannel = IsolateChannel<LogEntry>.connectSend(ports.logPort);
1212
final worker = SrpPasswordVerifierWorkerImpl();
1313
await worker.connect(logsChannel: logsChannel);
1414
final result = await worker.run(
1515
channel.stream.asBroadcastStream().cast(),
1616
channel.sink.cast(),
1717
);
1818
// ignore: invalid_use_of_protected_member
19-
worker.logger.finest('Finished');
19+
worker.logger.verbose('Finished');
2020
unawaited(worker.close());
2121
Isolate.exit(ports.donePort, result);
2222
}

packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import 'package:amplify_core/amplify_core.dart'
3737
import 'package:async/async.dart';
3838
import 'package:built_collection/built_collection.dart';
3939
import 'package:meta/meta.dart';
40-
import 'package:worker_bee/worker_bee.dart';
4140

4241
/// {@template amplify_auth_cognito.sign_in_state_machine}
4342
/// Base class for state machines which perform some auth flow. These all follow
@@ -97,6 +96,15 @@ class SignInStateMachine extends StateMachine<SignInEvent, SignInState> {
9796
final AsyncMemoizer<ConfirmDeviceWorker> _confirmDeviceWorkerMemoizer =
9897
AsyncMemoizer();
9998

99+
void _logWorkerBeeMessage(AWSLogger logger, LogEntry logEntry) {
100+
logger.log(
101+
logEntry.level,
102+
logEntry.message,
103+
logEntry.error,
104+
logEntry.stackTrace,
105+
);
106+
}
107+
100108
/// The SRP init worker.
101109
Future<SrpInitWorker> get initWorker async =>
102110
_initWorkerMemoizer.runOnce(() async {
@@ -105,8 +113,8 @@ class SignInStateMachine extends StateMachine<SignInEvent, SignInState> {
105113
return worker;
106114
}
107115
worker = SrpInitWorker.create();
108-
// TODO(dnys1): Log
109-
worker.logs.listen(safePrint);
116+
final logger = this.logger.createChild(worker.name);
117+
worker.logs.listen((entry) => _logWorkerBeeMessage(logger, entry));
110118
await worker.spawn();
111119
addInstance<SrpInitWorker>(worker);
112120
return worker;
@@ -120,8 +128,8 @@ class SignInStateMachine extends StateMachine<SignInEvent, SignInState> {
120128
return worker;
121129
}
122130
worker = SrpPasswordVerifierWorker.create();
123-
// TODO(dnys1): Log
124-
worker.logs.listen(safePrint);
131+
final logger = this.logger.createChild(worker.name);
132+
worker.logs.listen((entry) => _logWorkerBeeMessage(logger, entry));
125133
await worker.spawn();
126134
addInstance<SrpPasswordVerifierWorker>(worker);
127135
return worker;
@@ -135,8 +143,8 @@ class SignInStateMachine extends StateMachine<SignInEvent, SignInState> {
135143
return worker;
136144
}
137145
worker = SrpDevicePasswordVerifierWorker.create();
138-
// TODO(dnys1): Log
139-
worker.logs.listen(safePrint);
146+
final logger = this.logger.createChild(worker.name);
147+
worker.logs.listen((entry) => _logWorkerBeeMessage(logger, entry));
140148
await worker.spawn();
141149
addInstance<SrpDevicePasswordVerifierWorker>(worker);
142150
return worker;
@@ -150,8 +158,8 @@ class SignInStateMachine extends StateMachine<SignInEvent, SignInState> {
150158
return worker;
151159
}
152160
worker = ConfirmDeviceWorker.create();
153-
// TODO(dnys1): Log
154-
worker.logs.listen(safePrint);
161+
final logger = this.logger.createChild(worker.name);
162+
worker.logs.listen((entry) => _logWorkerBeeMessage(logger, entry));
155163
await worker.spawn();
156164
addInstance<ConfirmDeviceWorker>(worker);
157165
return worker;

0 commit comments

Comments
 (0)