Merge pull request #1 from psrenergy/gb/add_possibility-to-define-exc…

…eption

Remove the exit(1) and add the possibility of throwing an Exception

Project.toml

@@ -1,6 +1,6 @@
 name = "LoggingPolyglot"
 uuid = "211639cc-9b11-4cfd-abc6-8f7477829344"
-version = "0.1.0"
+version = "0.2.0"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/logger.jl

@@ -225,7 +225,7 @@ end
 
 function print_colored(io::IO, str::String; color::Symbol = :normal, reverse::Bool = false)
     if color == :normal && reverse == false
-        print(io, str) # MD Studio doesn't support colors and even printstyled with color = :normal and reverse = false doesn't work
+        print(io, str)
     else
         printstyled(io, str; color = color, reverse = reverse)
     end

src/logs.jl

@@ -1,15 +1,3 @@
-# Additional level
-macro fatal_error(msg)
-    quote
-        @logmsg FatalErrorLevel $(esc(msg))
-        if isinteractive()
-            error("Fatal Error")
-        else
-            exit(1)
-        end
-    end
-end
-
 # Direct logs
 function debug(msg::String; level::Int = -1000)
     @assert Logging.Debug <= Logging.LogLevel(level) < Logging.Info
@@ -28,8 +16,9 @@ function non_fatal_error(msg::String)
     @error msg
     return nothing
 end
-function fatal_error(msg::String)
-    @fatal_error msg
+function fatal_error(msg::String; exception::Exception = ErrorException("Fatal error"))
+    @logmsg FatalErrorLevel msg
+    throw(exception)
     return nothing
 end
 
@@ -100,8 +89,12 @@ function non_fatal_error(code::Int, replacements...)
     non_fatal_error(msg)
     return nothing
 end
-function fatal_error(code::Int, replacements...)
+function fatal_error(
+    code::Int,
+    replacements...;
+    exception::Exception = ErrorException("Fatal error"),
+)
     msg = prepare_msg(code, replacements...)
-    fatal_error(msg)
+    fatal_error(msg; exception = exception)
     return nothing
 end

test/test_logs.jl

@@ -47,6 +47,27 @@ function test_direct_log_error()
     return nothing
 end
 
+function test_direct_log_fatal_error()
+    log_error_path = "error.log"
+    polyglot_logger = LoggingPolyglot.create_polyglot_logger(log_error_path)
+    @test_throws ErrorException LoggingPolyglot.fatal_error("test message")
+    LoggingPolyglot.close_polyglot_logger(polyglot_logger)
+    rm(log_error_path; force = true)
+    return nothing
+end
+
+function test_direct_log_fatal_error_other_exception()
+    log_error_path = "error.log"
+    polyglot_logger = LoggingPolyglot.create_polyglot_logger(log_error_path)
+    @test_throws DimensionMismatch LoggingPolyglot.fatal_error(
+        "dim mismatch";
+        exception = DimensionMismatch(""),
+    )
+    LoggingPolyglot.close_polyglot_logger(polyglot_logger)
+    rm(log_error_path; force = true)
+    return nothing
+end
+
 function test_different_logs_same_file()
     log_path = "test.log"
     polyglot_logger = LoggingPolyglot.create_polyglot_logger(log_path)