Skip to content

Commit 3cd8c77

Browse files
authored
Move logging when connecting (#726)
1 parent 8ba1f41 commit 3cd8c77

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

lib/src/client.dart

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ abstract class Nyxx {
8686

8787
/// Create an instance of [NyxxRest] using the provided options.
8888
static Future<NyxxRest> connectRestWithOptions(RestApiOptions apiOptions, [RestClientOptions clientOptions = const RestClientOptions()]) async {
89-
clientOptions.logger
90-
..info('Connecting to the REST API')
91-
..fine('Token: ${apiOptions.token}, Authorization: ${apiOptions.authorizationHeader}, User-Agent: ${apiOptions.userAgent}')
92-
..fine('Plugins: ${clientOptions.plugins.map((plugin) => plugin.name).join(', ')}');
93-
9489
return _doConnect(apiOptions, clientOptions, () async {
90+
clientOptions.logger
91+
..info('Connecting to the REST API')
92+
..fine('Token: ${apiOptions.token}, Authorization: ${apiOptions.authorizationHeader}, User-Agent: ${apiOptions.userAgent}')
93+
..fine('Plugins: ${clientOptions.plugins.map((plugin) => plugin.name).join(', ')}');
94+
9595
final client = NyxxRest._(apiOptions, clientOptions);
9696

9797
return client
@@ -111,12 +111,12 @@ abstract class Nyxx {
111111
///
112112
/// Note that `client.user.id` will contain [Snowflake.zero] if there no `identify` scope.
113113
static Future<NyxxOAuth2> connectOAuth2WithOptions(OAuth2ApiOptions apiOptions, [RestClientOptions clientOptions = const RestClientOptions()]) async {
114-
clientOptions.logger
115-
..info('Connecting to the REST API via OAuth2')
116-
..fine('Token: ${apiOptions.token}, Authorization: ${apiOptions.authorizationHeader}, User-Agent: ${apiOptions.userAgent}')
117-
..fine('Plugins: ${clientOptions.plugins.map((plugin) => plugin.name).join(', ')}');
118-
119114
return _doConnect(apiOptions, clientOptions, () async {
115+
clientOptions.logger
116+
..info('Connecting to the REST API via OAuth2')
117+
..fine('Token: ${apiOptions.token}, Authorization: ${apiOptions.authorizationHeader}, User-Agent: ${apiOptions.userAgent}')
118+
..fine('Plugins: ${clientOptions.plugins.map((plugin) => plugin.name).join(', ')}');
119+
120120
final client = NyxxOAuth2._(apiOptions, clientOptions);
121121
final information = await client.users.fetchCurrentOAuth2Information();
122122

@@ -136,16 +136,16 @@ abstract class Nyxx {
136136
GatewayApiOptions apiOptions, [
137137
GatewayClientOptions clientOptions = const GatewayClientOptions(),
138138
]) async {
139-
clientOptions.logger
140-
..info('Connecting to the Gateway API')
141-
..fine(
142-
'Token: ${apiOptions.token}, Authorization: ${apiOptions.authorizationHeader}, User-Agent: ${apiOptions.userAgent},'
143-
' Intents: ${apiOptions.intents.value}, Payloads: ${apiOptions.payloadFormat.value}, Compression: ${apiOptions.compression.name},'
144-
' Shards: ${apiOptions.shards?.join(', ')}, Total shards: ${apiOptions.totalShards}, Large threshold: ${apiOptions.largeThreshold}',
145-
)
146-
..fine('Plugins: ${clientOptions.plugins.map((plugin) => plugin.name).join(', ')}');
147-
148139
return _doConnect(apiOptions, clientOptions, () async {
140+
clientOptions.logger
141+
..info('Connecting to the Gateway API')
142+
..fine(
143+
'Token: ${apiOptions.token}, Authorization: ${apiOptions.authorizationHeader}, User-Agent: ${apiOptions.userAgent},'
144+
' Intents: ${apiOptions.intents.value}, Payloads: ${apiOptions.payloadFormat.value}, Compression: ${apiOptions.compression.name},'
145+
' Shards: ${apiOptions.shards?.join(', ')}, Total shards: ${apiOptions.totalShards}, Large threshold: ${apiOptions.largeThreshold}',
146+
)
147+
..fine('Plugins: ${clientOptions.plugins.map((plugin) => plugin.name).join(', ')}');
148+
149149
final client = NyxxGateway._(apiOptions, clientOptions);
150150

151151
client

0 commit comments

Comments
 (0)