Improve/patch log parsing

GenieFramework · Jan 19, 2024 · a3df7ca · a3df7ca · essenciary · Jan 19, 2024
1 parent a4a0f1a
commit a3df7ca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "GenieDevTools"
 uuid = "4e5d9629-6565-4102-a9ff-45c707eb060e"
 authors = ["essenciary <[email protected]> and contributors"]
-version = "2.9.0"
+version = "2.9.1"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/GenieDevTools.jl b/src/GenieDevTools.jl
@@ -25,8 +25,15 @@ function runhooks()
   end
 end
 
-function tailapplog(handler::Function, logdirpath::String; frequency::Float64 = 0.5, env::AbstractString = "dev", remove_prefixes::Bool = true)
-  logpath = joinpath(logdirpath, "$env-$(Dates.today()).log")
+function tailapplog(handler::Function,
+                    logdirpath::String;
+                    frequency::Float64 = 0.5,
+                    env::AbstractString = "dev",
+                    remove_prefixes::Bool = true,
+                    logfile::AbstractString = "$env-$(Dates.today()).log",
+                    skiptoend::Bool = true) :: Nothing
+  logpath = joinpath(logdirpath, logfile)
+
   if ! isfile(logpath)
     @warn "No log file found at $logpath"
     return
@@ -38,11 +45,12 @@ function tailapplog(handler::Function, logdirpath::String; frequency::Float64 =
       return
     end
 
-    seekend(io)
+    skiptoend && seekend(io)
     output = ""
 
     while true
       line = read(io, String)
+
       if isempty(line)
         sleep(frequency)
         continue
@@ -64,10 +72,11 @@ function tailapplog(handler::Function, logdirpath::String; frequency::Float64 =
           end
 
           if remove_prefixes
-            line = replace(line, "^└" => "")
-            line = replace(line, "^┌" => "")
-            line = replace(line, "`" => '"')
-            line = replace(line, "^\\[" => "")
+            line = replace(line, r"^└ " => "")
+            line = replace(line, r"^┌ " => "")
+            line = replace(line, r"`" => '"')
+            line = replace(line, r"^\[ " => "")
+            line = replace(line, r"^│ " => "")
           end
 
           output = output * line * "\n"