Fixes for implementation details of CoreLogging which have changed (#9)

MeganDawson42 · web-flow · commit a9bd00e5782e · 2025-12-08T18:20:24.000+10:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ jobs:
     strategy:
       matrix:
         version:
-          - '1.4'
           - '1.6'
+          - '1.10'
           - '1'
           - 'nightly'
         os:
@@ -38,7 +38,7 @@ jobs:
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v3
         env:
           cache-name: cache-artifacts
         with:
diff --git a/src/LoggingStream.jl b/src/LoggingStream.jl
@@ -31,7 +31,7 @@ function Base.unsafe_write(s::LoggingStream, p::Ptr{UInt8}, n::UInt)
     #
     # NOTE: These refer to internals of CoreLogging and will need to be kept in
     # sync if things change upstream.
-    if #==# level >= Base.CoreLogging._min_enabled_level[] &&
+    if #==# (VERSION >= v"1.10" ? level.level >= Base.CoreLogging._min_enabled_level[] : level >= Base.CoreLogging._min_enabled_level[]) &&
             level >= s.logstate.min_enabled_level &&
             Logging.shouldlog(s.logger, level, _module, group, id)
         m = (n > 0 && unsafe_load(p, n) == UInt8('\n')) ? n-1 : n

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function Base.unsafe_write(s::LoggingStream, p::Ptr{UInt8}, n::UInt)`
`31`	`31`	`#`
`32`	`32`	`# NOTE: These refer to internals of CoreLogging and will need to be kept in`
`33`	`33`	`# sync if things change upstream.`
`34`		`- if #==# level >= Base.CoreLogging._min_enabled_level[] &&`
	`34`	`+ if #==# (VERSION >= v"1.10" ? level.level >= Base.CoreLogging._min_enabled_level[] : level >= Base.CoreLogging._min_enabled_level[]) &&`
`35`	`35`	`level >= s.logstate.min_enabled_level &&`
`36`	`36`	`Logging.shouldlog(s.logger, level, _module, group, id)`
`37`	`37`	`m = (n > 0 && unsafe_load(p, n) == UInt8('\n')) ? n-1 : n`