opt.: Loggers

lib/data/model/app/backup.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:logging/logging.dart';
 import 'package:toolbox/data/model/server/private_key_info.dart';
 import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/snippet.dart';
+import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/path.dart';
 import 'package:toolbox/data/store/docker.dart';
 import 'package:toolbox/data/store/private_key.dart';
@@ -15,8 +15,6 @@ import 'package:toolbox/locator.dart';
 
 const backupFormatVersion = 1;
 
-final _logger = Logger('Backup');
-
 class Backup {
   // backup format version
   final int version;
@@ -116,7 +114,7 @@ String _diyDecrypt(String raw) {
     }
     return sb.toString();
   } catch (e, trace) {
-    _logger.warning('Decrypt failed', e, trace);
+    Loggers.app.warning('Backup decrypt failed', e, trace);
     rethrow;
   }
 }

lib/data/model/server/proc.dart

@@ -1,9 +1,7 @@
-import 'package:logging/logging.dart';
+import 'package:toolbox/data/res/logger.dart';
 
 import '../../../data/res/misc.dart';
 
-final _logger = Logger('Proc');
-
 class _ProcValIdxMap {
   final int pid;
   final int? user;
@@ -144,7 +142,7 @@ class PsResult {
         procs.add(Proc.parse(line, map));
       } catch (e, trace) {
         errs.add('$line: $e');
-        _logger.warning('Parse process failed', e, trace);
+        Loggers.parse.warning('Process failed', e, trace);
       }
     }
 

lib/data/provider/docker.dart

@@ -2,13 +2,13 @@ import 'dart:async';
 
 import 'package:dartssh2/dartssh2.dart';
 import 'package:flutter/material.dart';
-import 'package:logging/logging.dart';
 import 'package:toolbox/core/extension/ssh_client.dart';
 import 'package:toolbox/core/extension/stringx.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
 import 'package:toolbox/data/model/docker/image.dart';
 import 'package:toolbox/data/model/docker/ps.dart';
 import 'package:toolbox/data/model/app/error.dart';
+import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/store/docker.dart';
 import 'package:toolbox/locator.dart';
 
@@ -20,8 +20,6 @@ final _versionReg = RegExp(r'(Version:)\s+([0-9]+\.[0-9]+\.[0-9]+)');
 final _editionReg = RegExp(r'Docker Engine - [a-zA-Z]+');
 final _dockerPrefixReg = RegExp(r'(sudo )?docker ');
 
-final _logger = Logger('DOCKER');
-
 class DockerProvider extends ChangeNotifier {
   final _dockerStore = locator<DockerStore>();
 
@@ -64,7 +62,6 @@ class DockerProvider extends ChangeNotifier {
 
     if (raw.contains(_dockerNotFound)) {
       error = DockerErr(type: DockerErrType.notInstalled);
-      _logger.warning('Docker not installed: $raw');
       notifyListeners();
       return;
     }
@@ -73,7 +70,7 @@ class DockerProvider extends ChangeNotifier {
     final segments = raw.split(seperator);
     if (segments.length != DockerCmdType.values.length) {
       error = DockerErr(type: DockerErrType.segmentsNotMatch);
-      _logger.warning('Docker segments not match: ${segments.length}');
+      Loggers.parse.warning('Docker segments: ${segments.length}');
       notifyListeners();
       return;
     }
@@ -90,12 +87,12 @@ class DockerProvider extends ChangeNotifier {
       lines.removeWhere((element) => element.isEmpty);
       if (lines.isNotEmpty) lines.removeAt(0);
       items = lines.map((e) => DockerPsItem.fromRawString(e)).toList();
-    } catch (e) {
+    } catch (e, trace) {
       error = DockerErr(
         type: DockerErrType.parsePsItem,
         message: '$psRaw\n-\n$e',
       );
-      _logger.warning('Parse docker ps: $psRaw', e);
+      Loggers.parse.warning('Docker ps failed', e, trace);
     } finally {
       notifyListeners();
     }
@@ -112,7 +109,7 @@ class DockerProvider extends ChangeNotifier {
         type: DockerErrType.parseImages,
         message: '$imageRaw\n-\n$e',
       );
-      _logger.warning('Parse docker images: $imageRaw', e, trace);
+      Loggers.parse.warning('Docker images failed', e, trace);
     } finally {
       notifyListeners();
     }

lib/data/provider/server.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
-import 'package:logging/logging.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
 import 'package:toolbox/data/model/server/system.dart';
+import 'package:toolbox/data/res/logger.dart';
 
 import '../../core/extension/order.dart';
 import '../../core/extension/uint8list.dart';
@@ -33,8 +33,6 @@ class ServerProvider extends ChangeNotifier {
 
   Timer? _timer;
 
-  final _logger = Logger('SERVER');
-
   final _serverStore = locator<ServerStore>();
   final _settingStore = locator<SettingStore>();
 
@@ -250,13 +248,13 @@ class ServerProvider extends ChangeNotifier {
         _setServerState(s, ServerState.failed);
 
         /// In order to keep privacy, print [spi.name] instead of [spi.id]
-        _logger.warning('Connect to ${spi.name} failed', e);
+        Loggers.app.warning('Connect to ${spi.name} failed', e);
         return;
       }
 
       final time2 = DateTime.now();
       final spentTime = time2.difference(time1).inMilliseconds;
-      _logger.info('Connected to ${spi.name} in $spentTime ms.');
+      Loggers.app.info('Connected to ${spi.name} in $spentTime ms.');
 
       _setServerState(s, ServerState.connected);
 
@@ -272,7 +270,7 @@ class ServerProvider extends ChangeNotifier {
         _limiter.inc(sid);
         s.status.failedInfo = e.toString();
         _setServerState(s, ServerState.failed);
-        _logger.warning('Write script to ${spi.name} failed', e);
+        Loggers.app.warning('Write script to ${spi.name} failed', e);
         return;
       }
     }
@@ -312,7 +310,7 @@ class ServerProvider extends ChangeNotifier {
       _limiter.inc(sid);
       s.status.failedInfo = 'Parse failed: $e\n\n$raw';
       _setServerState(s, ServerState.failed);
-      _logger.warning('Parse failed', e, trace);
+      Loggers.parse.warning('Server status', e, trace);
       return;
     }
 

lib/data/res/logger.dart

@@ -0,0 +1,6 @@
+import 'package:logging/logging.dart';
+
+class Loggers {
+  static final app = Logger('App');
+  static final parse = Logger('Parse');
+}