Skip to content

Commit 3e277df

Browse files
SERDUNclaude
andcommitted
refactor(logging): move logzioLogLevel resolution into LogzioLoggingService.fromEnvironment
- fromEnvironment() now reads REMOTE_LOGZIO_LOG_LEVEL internally, no longer takes minLevel param - AppLogger.init() drops logzioLogLevel parameter, uses _logzioService?.minLevel in applyConfig - remove environment_config.dart import from services_isolate.dart Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent ca1e29c commit 3e277df

4 files changed

Lines changed: 9 additions & 16 deletions

File tree

lib/bootstrap.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,9 @@ Future<InstanceRegistry> bootstrap() async {
115115
);
116116

117117
// Logger
118-
final logzioLogLevel = Level.LEVELS.firstWhere((l) => l.name == EnvironmentConfig.REMOTE_LOGZIO_LOG_LEVEL);
119118
final appLogger = await AppLogger.init(
120119
featureAccess.loggingConfig.logLevel,
121-
logzioLogLevel,
122-
LogzioLoggingService.fromEnvironment(featureAccess.loggingConfig.remoteLoggingEnabled, logzioLogLevel),
120+
LogzioLoggingService.fromEnvironment(featureAccess.loggingConfig.remoteLoggingEnabled),
123121
appLabels,
124122
);
125123
final appLoggerRepository = LogRecordsRepository.create(useFileStorage: true, path: appPath.temporaryPath)
@@ -286,11 +284,9 @@ Future<void> _handleBackgroundMessage(RemoteMessage message, Logger logger) asyn
286284

287285
final overrides = FeatureOverridesFactory.create(remoteCacheConfigService.snapshot);
288286
final loggingConfig = LoggingMapper.mapFromOverridesOnly(overrides);
289-
final logzioLogLevel = Level.LEVELS.firstWhere((l) => l.name == EnvironmentConfig.REMOTE_LOGZIO_LOG_LEVEL);
290287
await AppLogger.init(
291288
loggingConfig.logLevel,
292-
logzioLogLevel,
293-
LogzioLoggingService.fromEnvironment(loggingConfig.remoteLoggingEnabled, logzioLogLevel),
289+
LogzioLoggingService.fromEnvironment(loggingConfig.remoteLoggingEnabled),
294290
appLabelsProvider,
295291
);
296292

lib/common/logging/logzio_logging_service.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ final _logger = Logger('LogzioLoggingService');
1212
class LogzioLoggingService implements RemoteLoggingService {
1313
LogzioLoggingService({required this.url, required this.token, required this.bufferSize, required this.minLevel});
1414

15-
static LogzioLoggingService? fromEnvironment(bool enabled, Level minLevel) {
15+
static LogzioLoggingService? fromEnvironment(bool enabled) {
1616
if (!enabled) return null;
1717

1818
const url = EnvironmentConfig.REMOTE_LOGZIO_LOGGING_URL;
1919
const token = EnvironmentConfig.REMOTE_LOGZIO_LOGGING_TOKEN;
2020
if (url == null || token == null) return null;
2121

22+
final minLevel = Level.LEVELS.firstWhere((l) => l.name == EnvironmentConfig.REMOTE_LOGZIO_LOG_LEVEL);
23+
2224
return LogzioLoggingService(
2325
url: url,
2426
token: token,

lib/data/app_logger.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ final _logger = Logger('AppLogger');
1313
class AppLogger {
1414
static Future<AppLogger> init(
1515
Level logLevel,
16-
Level logzioLogLevel,
1716
LogzioLoggingService? logzioService,
1817
AppMetadataProvider labelsProvider,
1918
) async {
@@ -27,21 +26,20 @@ class AppLogger {
2726

2827
logzioService?.initialize(labelsProvider.logLabels);
2928

30-
final instance = AppLogger._(logzioService, labelsProvider, logzioLogLevel);
29+
final instance = AppLogger._(logzioService, labelsProvider);
3130
instance.applyConfig(logLevel);
3231

3332
return instance;
3433
}
3534

36-
AppLogger._(this._logzioService, this._labelsProvider, this._logzioLogLevel);
35+
AppLogger._(this._logzioService, this._labelsProvider);
3736

3837
final LogzioLoggingService? _logzioService;
3938
final AppMetadataProvider _labelsProvider;
40-
final Level _logzioLogLevel;
4139

4240
void applyConfig(Level logLevel) {
4341
Logger.root.level = logLevel;
44-
EquatableConfig.stringify = logLevel <= Level.FINE || _logzioLogLevel <= Level.FINE;
42+
EquatableConfig.stringify = logLevel <= Level.FINE || (_logzioService?.minLevel ?? Level.OFF) <= Level.FINE;
4543
_logger.info('AppLogger log level applied: $logLevel');
4644
}
4745

lib/features/call/services/services_isolate.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:webtrit_callkeep/webtrit_callkeep.dart';
44

55
import 'package:webtrit_phone/common/common.dart';
66
import 'package:webtrit_phone/data/data.dart';
7-
import 'package:webtrit_phone/environment_config.dart';
87
import 'package:webtrit_phone/models/models.dart';
98
import 'package:webtrit_phone/repositories/repositories.dart';
109
import 'package:webtrit_phone/services/services.dart';
@@ -40,11 +39,9 @@ Future<void> _initializeCommonDependencies() async {
4039
_appLabelsProvider ??= await DefaultAppMetadataProvider.init(_packageInfo!, _deviceInfo!, _appInfo!, _secureStorage!);
4140
final isolateOverrides = FeatureOverridesFactory.create(_remoteConfigService!.snapshot);
4241
final isolateLoggingConfig = LoggingMapper.mapFromOverridesOnly(isolateOverrides);
43-
final logzioLogLevel = Level.LEVELS.firstWhere((l) => l.name == EnvironmentConfig.REMOTE_LOGZIO_LOG_LEVEL);
4442
_appLogger ??= await AppLogger.init(
4543
isolateLoggingConfig.logLevel,
46-
logzioLogLevel,
47-
LogzioLoggingService.fromEnvironment(isolateLoggingConfig.remoteLoggingEnabled, logzioLogLevel),
44+
LogzioLoggingService.fromEnvironment(isolateLoggingConfig.remoteLoggingEnabled),
4845
_appLabelsProvider!,
4946
);
5047
_appCertificates ??= await AppCertificates.init();

0 commit comments

Comments
 (0)