enable progress logs from modules outside the notebook, fixes #1862

fonsp · Jan 28, 2022 · c4a0f53 · c4a0f53
1 parent 989231c
commit c4a0f53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
@@ -6,9 +6,10 @@ import { SimpleOutputBody } from "./TreeView.js"
 // Defined in editor.css
 const GRID_WIDTH = 10
 const RESIZE_THROTTLE = 60
+const PROGRESS_LOG_LEVEL = "LogLevel(-1)"
 
 const is_progress_log = (log) => {
-    return log.kwargs.find((kwarg) => kwarg[0] === "progress") !== undefined
+    return log.level == PROGRESS_LOG_LEVEL && log.kwargs.find((kwarg) => kwarg[0] === "progress") !== undefined
 }
 
 export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
@@ -99,7 +100,7 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
     // }, [body])
     const [inspecting, set_inspecting] = useState(false)
 
-    const is_progress = is_progress_log({ kwargs })
+    const is_progress = is_progress_log({ level, kwargs })
     let progress = null
     if (is_progress) {
         progress = kwargs.find((p) => p[0] === "progress")[1][0]

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
@@ -1983,7 +1983,11 @@ function Logging.shouldlog(::PlutoLogger, level, _module, _...)
     # Accept logs
     # - From the user's workspace module
     # - Info level and above for other modules
-    (_module isa Module && is_pluto_workspace(_module)) || convert(Logging.LogLevel, level) >= Logging.Info
+    # - LogLevel(-1) because that's what ProgressLogging.jl uses for its messages
+    level = convert(Logging.LogLevel, level)
+    (_module isa Module && is_pluto_workspace(_module)) ||
+        level >= Logging.Info ||
+        level == Logging.LogLevel(-1)
 end
 
 Logging.min_enabled_level(::PlutoLogger) = Logging.Debug