Skip to content

Commit a6970d9

Browse files
committed
Added origin LogEvent to OutputEvent, addresses simc/logger#133
1 parent 77cdd82 commit a6970d9

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

lib/src/logger.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ class LogEvent {
2323
final dynamic error;
2424
final StackTrace? stackTrace;
2525

26-
LogEvent(this.level, this.message, this.error, this.stackTrace);
26+
LogEvent(this.level, this.message, [this.error, this.stackTrace]);
2727
}
2828

2929
class OutputEvent {
30-
final Level level;
3130
final List<String> lines;
31+
final LogEvent origin;
32+
33+
Level get level => origin.level;
3234

33-
OutputEvent(this.level, this.lines);
35+
OutputEvent(this.origin, this.lines);
3436
}
3537

3638
typedef LogCallback = void Function(LogEvent event);
@@ -120,7 +122,7 @@ class Logger {
120122
var output = _printer.log(logEvent);
121123

122124
if (output.isNotEmpty) {
123-
var outputEvent = OutputEvent(level, output);
125+
var outputEvent = OutputEvent(logEvent, output);
124126
// Issues with log output should NOT influence
125127
// the main software behavior.
126128
try {

test/outputs/memory_output_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ void main() {
55
test('Memory output buffer size is limited', () {
66
var output = MemoryOutput(bufferSize: 2);
77

8-
final event0 = OutputEvent(Level.info, []);
9-
final event1 = OutputEvent(Level.info, []);
10-
final event2 = OutputEvent(Level.info, []);
8+
final event0 = OutputEvent(LogEvent(Level.info, null), []);
9+
final event1 = OutputEvent(LogEvent(Level.info, null), []);
10+
final event2 = OutputEvent(LogEvent(Level.info, null), []);
1111

1212
output.output(event0);
1313
output.output(event1);

test/outputs/multi_output_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ void main() {
88

99
final multiOutput = MultiOutput([output1, output2]);
1010

11-
final event0 = OutputEvent(Level.info, []);
11+
final event0 = OutputEvent(LogEvent(Level.info, null), []);
1212
multiOutput.output(event0);
1313

1414
expect(output1.buffer.length, 1);
1515
expect(output2.buffer.length, 1);
1616
expect(output1.buffer.elementAt(0), equals(output2.buffer.elementAt(0)));
1717
expect(output1.buffer.elementAt(0), equals(event0));
1818

19-
final event1 = OutputEvent(Level.info, []);
19+
final event1 = OutputEvent(LogEvent(Level.info, null), []);
2020
multiOutput.output(event1);
2121

2222
expect(output1.buffer.length, 2);
@@ -29,11 +29,11 @@ void main() {
2929

3030
test('passing null does not throw an exception', () {
3131
final output = MultiOutput(null);
32-
output.output(OutputEvent(Level.info, []));
32+
output.output(OutputEvent(LogEvent(Level.info, null), []));
3333
});
3434

3535
test('passing null in the list does not throw an exception', () {
3636
final output = MultiOutput([null]);
37-
output.output(OutputEvent(Level.info, []));
37+
output.output(OutputEvent(LogEvent(Level.info, null), []));
3838
});
3939
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:test/test.dart';
21
import 'package:logger/logger.dart';
2+
import 'package:test/test.dart';
33

44
void main() {
55
test('writes to a Stream', () {
@@ -9,19 +9,19 @@ void main() {
99
expect(e, ['hi there']);
1010
});
1111

12-
out.output(OutputEvent(Level.debug, ['hi there']));
12+
out.output(OutputEvent(LogEvent(Level.debug, null), ['hi there']));
1313
});
1414

1515
test('respects listen', () {
1616
var out = StreamOutput();
1717

18-
out.output(OutputEvent(Level.debug, ['dropped']));
18+
out.output(OutputEvent(LogEvent(Level.debug, null), ['dropped']));
1919

2020
out.stream.listen((var e) {
2121
expect(e, ['hi there']);
2222
});
2323

24-
out.output(OutputEvent(Level.debug, ['hi there']));
24+
out.output(OutputEvent(LogEvent(Level.debug, null), ['hi there']));
2525
});
2626

2727
test('respects pause', () {
@@ -32,8 +32,8 @@ void main() {
3232
});
3333

3434
sub.pause();
35-
out.output(OutputEvent(Level.debug, ['dropped']));
35+
out.output(OutputEvent(LogEvent(Level.debug, null), ['dropped']));
3636
sub.resume();
37-
out.output(OutputEvent(Level.debug, ['hi there']));
37+
out.output(OutputEvent(LogEvent(Level.debug, null), ['hi there']));
3838
});
3939
}

0 commit comments

Comments
 (0)