Skip to content

Commit 3114b8d

Browse files
IvoB1987Perondas
andauthored
Update logger.dart (#337)
* Update logger.dart * Replaced Log references with logger --------- Co-authored-by: Perondas <Pperondas@gmail.com>
1 parent 5022b43 commit 3114b8d

File tree

4 files changed

+14
-69
lines changed

4 files changed

+14
-69
lines changed

lib/src/logger.dart

Lines changed: 9 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -7,77 +7,21 @@ import 'stack_trace_nj.dart';
77
Logger logger = Log();
88

99
class Log extends Logger {
10-
Log();
11-
Log._internal(String currentWorkingDirectory)
12-
: super(printer: MyLogPrinter(currentWorkingDirectory));
13-
14-
factory Log.d(String message, [dynamic error, StackTrace? stackTrace]) {
15-
autoInit();
16-
_self!.d(message, error, stackTrace);
17-
return _self!;
18-
}
19-
20-
factory Log.i(String message, [dynamic error, StackTrace? stackTrace]) {
21-
autoInit();
22-
_self!.i(message, error, stackTrace);
23-
return _self!;
24-
}
25-
26-
factory Log.w(String message, [dynamic error, StackTrace? stackTrace]) {
27-
autoInit();
28-
_self!.w(message, error, stackTrace);
29-
return _self!;
30-
}
31-
32-
factory Log.e(String message, [dynamic error, StackTrace? stackTrace]) {
33-
autoInit();
34-
_self!.e(message, error, stackTrace);
35-
return _self!;
36-
}
37-
38-
static Log? _self;
39-
static late String _localPath;
40-
static Level _loggingLevel = Level.debug;
41-
static set loggingLevel(Level loggingLevel) => _loggingLevel = loggingLevel;
42-
43-
void debug(String message, [dynamic error, StackTrace? stackTrace]) {
44-
autoInit();
45-
Log.d(message, error, stackTrace);
46-
}
47-
48-
void info(String message, [dynamic error, StackTrace? stackTrace]) {
49-
autoInit();
50-
Log.i(message, error, stackTrace);
51-
}
52-
53-
void warn(String message, [dynamic error, StackTrace? stackTrace]) {
54-
autoInit();
55-
Log.w(message, error, stackTrace);
56-
}
57-
58-
void error(String message, [dynamic error, StackTrace? stackTrace]) {
59-
autoInit();
60-
Log.e(message, error, stackTrace);
61-
}
62-
63-
static void autoInit() {
64-
if (_self == null) {
65-
init('.');
66-
}
67-
}
68-
69-
static void init(String currentWorkingDirectory) {
70-
_self = Log._internal(currentWorkingDirectory);
71-
10+
Log() : super(printer: MyLogPrinter('.')) {
7211
StackTraceNJ frames = StackTraceNJ();
7312

74-
if (frames.frames != null)
13+
if (frames.frames != null) {
7514
for (Stackframe frame in frames.frames!) {
7615
_localPath = frame.sourceFile.path
7716
.substring(frame.sourceFile.path.lastIndexOf('/'));
7817
break;
7918
}
19+
}
8020
}
21+
22+
static late String _localPath;
23+
static Level _loggingLevel = Level.debug;
24+
static set loggingLevel(Level loggingLevel) => _loggingLevel = loggingLevel;
8125
}
8226

8327
class MyLogPrinter extends LogPrinter {
@@ -111,7 +55,7 @@ class MyLogPrinter extends LogPrinter {
11155
StackTraceNJ frames = StackTraceNJ();
11256
int i = 0;
11357
int depth = 0;
114-
if (frames.frames != null)
58+
if (frames.frames != null) {
11559
for (Stackframe frame in frames.frames!) {
11660
i++;
11761
String path2 = frame.sourceFile.path;
@@ -120,6 +64,7 @@ class MyLogPrinter extends LogPrinter {
12064
break;
12165
}
12266
}
67+
}
12368

12469
print(color(
12570
'[$formattedDate] ${event.level} ${StackTraceNJ(skipFrames: depth).formatStackTrace(methodCount: 1)} ::: ${event.message}'));

lib/src/sip_ua_helper.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class SIPUAHelper extends EventManager {
6262
if (_ua != null) {
6363
_ua!.stop();
6464
} else {
65-
Log.w('ERROR: stop called but not started, call start first.');
65+
logger.w('ERROR: stop called but not started, call start first.');
6666
}
6767
}
6868

@@ -77,7 +77,7 @@ class SIPUAHelper extends EventManager {
7777
assert(registered, 'ERROR: you must call register first.');
7878
_ua!.unregister(all: all);
7979
} else {
80-
Log.e('ERROR: unregister called, you must call start first.');
80+
logger.e('ERROR: unregister called, you must call start first.');
8181
}
8282
}
8383

lib/src/transports/websocket_interface.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class WebSocketInterface implements Socket {
110110
protocols: <String>[_websocket_protocol],
111111
webSocketSettings: _webSocketSettings);
112112
} catch (e, s) {
113-
Log.e(e.toString(), null, s);
113+
logger.e(e.toString(), null, s);
114114
_connected = false;
115115
logger.e('WebSocket $_url error: $e');
116116
}

lib/src/ua.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class UA extends EventManager {
331331
rtcSession.terminate();
332332
}
333333
} catch (error, s) {
334-
Log.e(error.toString(), null, s);
334+
logger.e(error.toString(), null, s);
335335
}
336336
}
337337
});
@@ -344,7 +344,7 @@ class UA extends EventManager {
344344
Subscriber subscriber = _subscribers[key]!;
345345
subscriber.terminate(null);
346346
} catch (error, s) {
347-
Log.e(error.toString(), null, s);
347+
logger.e(error.toString(), null, s);
348348
}
349349
}
350350
});

0 commit comments

Comments
 (0)