Skip to content

Commit 1c26386

Browse files
committed
fix all the indenting
1 parent 710763b commit 1c26386

File tree

9 files changed

+58
-63
lines changed

9 files changed

+58
-63
lines changed

README.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ If it was to be defined in a compositional way,
3939
we would write something along the lines of:
4040
```
4141
ConsoleLogger(stream, min_level) =
42-
MinLevelLogger(
43-
ActiveFilteredLogger(max_log_filter,
44-
PureConsoleLogger(stream)
45-
),
46-
min_level
47-
)
42+
MinLevelLogger(
43+
ActiveFilteredLogger(max_log_filter,
44+
PureConsoleLogger(stream)
45+
),
46+
min_level
47+
)
4848
```
4949

5050

@@ -60,7 +60,7 @@ For full details, see the [Julia documentation on Logging](https://docs.julialan
6060
To use a `logger` in a given scope do
6161
```
6262
with_logger(logger) do
63-
#things
63+
#things
6464
end
6565
```
6666

@@ -119,17 +119,17 @@ and warnings and above to another.
119119
julia> using Logging; using LoggingExtras;
120120
121121
julia> demux_logger = DemuxLogger(
122-
MinLevelLogger(FileLogger("info.log"), Logging.Info),
123-
MinLevelLogger(FileLogger("warn.log"), Logging.Warn),
122+
MinLevelLogger(FileLogger("info.log"), Logging.Info),
123+
MinLevelLogger(FileLogger("warn.log"), Logging.Warn),
124124
include_current_global=false
125125
);
126126
127127
128128
julia> with_logger(demux_logger) do
129-
@warn("It is bad")
130-
@info("normal stuff")
131-
@error("THE WORSE THING")
132-
@debug("it is chill")
129+
@warn("It is bad")
130+
@info("normal stuff")
131+
@error("THE WORSE THING")
132+
@debug("it is chill")
133133
end
134134
135135
shell> cat warn.log
@@ -160,17 +160,17 @@ We want to filter to only log strings staring with `"Yo Dawg!"`.
160160

161161
```
162162
julia> function yodawg_filter(log_args)
163-
startswith(log_args.message, "Yo Dawg!")
163+
startswith(log_args.message, "Yo Dawg!")
164164
end
165165
yodawg_filter (generic function with 1 method)
166166
167167
julia> filtered_logger = ActiveFilteredLogger(yodawg_filter, global_logger());
168168
169169
julia> with_logger(filtered_logger) do
170-
@info "Boring message"
171-
@warn "Yo Dawg! it is bad"
172-
@info "Another boring message"
173-
@info "Yo Dawg! it is all good"
170+
@info "Boring message"
171+
@warn "Yo Dawg! it is bad"
172+
@info "Another boring message"
173+
@info "Yo Dawg! it is all good"
174174
end
175175
┌ Warning: Yo Dawg! it is bad
176176
└ @ Main REPL[28]:3
@@ -307,12 +307,12 @@ using HTTP
307307
308308
transformer_logger(global_logger()) do log
309309
if log._module == HTTP && log.level=Logging.Debug
310-
# Merge can be used to construct a new NamedTuple
311-
# which effectively is the overwriting of fields of a NamedTuple
312-
return merge(log, (; level=Logging.Info))
313-
else
314-
return log
315-
end
310+
# Merge can be used to construct a new NamedTuple
311+
# which effectively is the overwriting of fields of a NamedTuple
312+
return merge(log, (; level=Logging.Info))
313+
else
314+
return log
315+
end
316316
end
317317
318318
global_logger(transformer_logger)

src/LoggingExtras.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ using Base.CoreLogging:
66

77
import Base.CoreLogging:
88
AbstractLogger, SimpleLogger,
9-
handle_message, shouldlog, min_enabled_level, catch_exceptions
9+
handle_message, shouldlog, min_enabled_level, catch_exceptions
1010

1111
export demux_global_logger,
1212
DemuxLogger, TransformerLogger, FileLogger,

src/activefiltered.jl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
ActiveFilteredLogger(filter, logger)
2+
ActiveFilteredLogger(filter, logger)
33
44
Wraps `logger` in an active filter.
55
While loggers intrinsictally have in built filtering mechanisms.
@@ -20,17 +20,17 @@ As input it will be given a named tuple with the following fields:
2020
See `?LoggingExtra.handle_message_args` for more information on what each is.
2121
"""
2222
struct ActiveFilteredLogger{T <: AbstractLogger, F} <: AbstractLogger
23-
filter::F
24-
logger::T
23+
filter::F
24+
logger::T
2525
end
2626

2727

2828
function handle_message(logger::ActiveFilteredLogger, args...; kwargs...)
2929
log_args = handle_message_args(args...; kwargs...)
3030
if comp_handle_message_check(logger.logger, args...; kwargs...)
3131
if logger.filter(log_args)
32-
handle_message(logger.logger, args...; kwargs...)
33-
end
32+
handle_message(logger.logger, args...; kwargs...)
33+
end
3434
end
3535
end
3636

@@ -67,5 +67,3 @@ function handle_message_args(args...; kwargs...)
6767
fieldvals = (args..., kwargs)
6868
return NamedTuple{fieldnames, typeof(fieldvals)}(fieldvals)
6969
end
70-
71-

src/demux.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
struct DemuxLogger <: AbstractLogger
2-
loggers::Vector{AbstractLogger}
2+
loggers::Vector{AbstractLogger}
33
end
44

55

@@ -15,28 +15,28 @@ Normally this would be the ConsoleLogger in the REPL etc.
1515
"""
1616
function DemuxLogger(loggers::Vararg{AbstractLogger}; include_current_global=true)
1717
loggers = Vector{AbstractLogger}(collect(loggers))
18-
if include_current_global
19-
push!(loggers, global_logger())
20-
end
21-
DemuxLogger(loggers)
18+
if include_current_global
19+
push!(loggers, global_logger())
20+
end
21+
DemuxLogger(loggers)
2222
end
2323

2424
function handle_message(demux::DemuxLogger, args...; kwargs...)
25-
for logger in demux.loggers
25+
for logger in demux.loggers
2626
if comp_handle_message_check(logger, args...; kwargs...)
27-
handle_message(logger, args...; kwargs...)
28-
end
29-
end
27+
handle_message(logger, args...; kwargs...)
28+
end
29+
end
3030
end
3131

3232
function shouldlog(demux::DemuxLogger, args...)
33-
any(comp_shouldlog(logger, args...) for logger in demux.loggers)
33+
any(comp_shouldlog(logger, args...) for logger in demux.loggers)
3434
end
3535

3636
function min_enabled_level(demux::DemuxLogger)
37-
minimum(min_enabled_level(logger) for logger in demux.loggers)
37+
minimum(min_enabled_level(logger) for logger in demux.loggers)
3838
end
3939

4040
function catch_exceptions(demux::DemuxLogger)
41-
any(catch_exceptions(logger) for logger in demux.loggers)
41+
any(catch_exceptions(logger) for logger in demux.loggers)
4242
end

src/earlyfiltered.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
EarlyFilteredLogger(filter, logger)
2+
EarlyFilteredLogger(filter, logger)
33
44
Wraps `logger` in an filter that runs before the log message is created.
55
@@ -16,8 +16,8 @@ As input it will be given a named tuple with the following fields:
1616
See `?LoggingExtra.shouldlog_args` for more information on what each is.
1717
"""
1818
struct EarlyFilteredLogger{T <: AbstractLogger, F} <: AbstractLogger
19-
filter::F
20-
logger::T
19+
filter::F
20+
logger::T
2121
end
2222

2323

src/filelogger.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
struct FileLogger <: AbstractLogger
2-
logger::SimpleLogger
2+
logger::SimpleLogger
33
always_flush::Bool
44
end
55

@@ -10,7 +10,7 @@ end
1010

1111

1212
function handle_message(filelogger::FileLogger, args...; kwargs...)
13-
handle_message(filelogger.logger, args...; kwargs...)
13+
handle_message(filelogger.logger, args...; kwargs...)
1414
filelogger.always_flush && flush(filelogger.logger.stream)
1515
end
1616
shouldlog(filelogger::FileLogger, arg...) = true

src/minlevelfiltered.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""
2-
MinLevelLogger(logger, min_enabled_level)
2+
MinLevelLogger(logger, min_enabled_level)
33
44
Wraps `logger` in an filter that runs before the log message is created.
55
In many ways this is just a specialised [`EarlyFilteredLogger`](@ref)
66
that only checks the level.
77
This filter only allowed messages on or above the `min_enabled_level` to pass.
88
"""
99
struct MinLevelLogger{T <: AbstractLogger, L} <: AbstractLogger
10-
logger::T
10+
logger::T
1111
min_level::L
1212
end
1313

src/transformer.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ See `?LoggingExtra.handle_message_args` for more information on what each is.
1313
"""
1414
struct TransformerLogger{T<:AbstractLogger, F} <: AbstractLogger
1515
transform::F
16-
logger::T
16+
logger::T
1717
end
1818

1919

2020
function handle_message(transformer::TransformerLogger, args...; kwargs...)
21-
log_args = handle_message_args(args...; kwargs...)
21+
log_args = handle_message_args(args...; kwargs...)
2222
new_log_args = transformer.transform(log_args)
23-
23+
2424
args = Tuple(new_log_args)[1:end-1]
2525
kwargs = new_log_args.kwargs
2626

2727
if comp_handle_message_check(transformer.logger, args...; kwargs...)
28-
handle_message(transformer.logger, args...; kwargs...)
29-
end
28+
handle_message(transformer.logger, args...; kwargs...)
29+
end
3030
end
3131

3232
shouldlog(transformer::TransformerLogger, args...) = true

test/runtests.jl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ using Test: collect_test_logs, TestLogger
1717
end
1818
@test length(testlogger_info.logs) == 3
1919
@test length(testlogger_warn.logs) == 1
20-
2120
end
2221

2322

@@ -42,7 +41,7 @@ end
4241
yodawg_filter(logargs) = startswith(logargs.message, "Yo Dawg!")
4342

4443
filtered_logger = ActiveFilteredLogger(yodawg_filter, testlogger)
45-
44+
4645
with_logger(filtered_logger) do
4746
@info "info1"
4847
@warn "Yo Dawg! It is a warning"
@@ -58,7 +57,7 @@ end
5857
filtered_logger = EarlyFilteredLogger(testlogger) do logargs
5958
logargs.level == Info # Only exactly Info, nothing more nothing less
6059
end
61-
60+
6261
with_logger(filtered_logger) do
6362
@info "info1"
6463
@warn "Yo Dawg! It is a warning"
@@ -71,7 +70,7 @@ end
7170
@testset "MinLevel Filter" begin
7271
testlogger = TestLogger()
7372
filtered_logger = MinLevelLogger(testlogger, Warn)
74-
73+
7574
with_logger(filtered_logger) do
7675
@info "info1"
7776
@warn "Yo Dawg! It is a warning"
@@ -94,7 +93,7 @@ end
9493
return log_msg
9594
end
9695
end
97-
96+
9897
with_logger(transformer_logger) do
9998
@info "info1"
10099
@warn "Yo Dawg! It is a warning"
@@ -105,5 +104,3 @@ end
105104
end
106105
@test length(testlogger.logs) == 2
107106
end
108-
109-

0 commit comments

Comments
 (0)