refactor(all): replace chalkConfig in nil comparisons

crashappsec · Jun 17, 2024 · db0537e · db0537e
1 parent 7aa99b9
commit db0537e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/chalk_common.nim b/src/chalk_common.nim
@@ -479,7 +479,7 @@ var
   dockerInvocation*:      DockerInvocation
 
 template dumpExOnDebug*() =
-  if chalkConfig != nil and get[bool](getChalkScope(), "chalk_debug"):
+  if getChalkScope() != nil and get[bool](getChalkScope(), "chalk_debug"):
     let
       msg = "" # "Handling exception (msg = " & getCurrentExceptionMsg() & ")\n"
       tb  = "Traceback (most recent call last)\n" &

diff --git a/src/confload.nim b/src/confload.nim
@@ -107,7 +107,7 @@ proc loadLocalStructs*(state: ConfigState) =
   setCon4mVerbosity(c4errLevel)
 
 proc handleCon4mErrors(err, tb: string): bool =
-  if tb != "" and chalkConfig == nil or get[bool](getChalkScope(), "chalk_debug"):
+  if tb != "" and getChalkScope() == nil or get[bool](getChalkScope(), "chalk_debug"):
      echo(formatCompilerError(err, nil, tb, default(InstInfo)))
   else:
     error(err)

diff --git a/src/selfextract.nim b/src/selfextract.nim
@@ -150,7 +150,7 @@ proc getSelfExtraction*(): Option[ChalkObj] =
 # The rest of this is specific to writing the self-config.
 
 proc newConfFileError(err, tb: string): bool =
-  if chalkConfig != nil and get[bool](getChalkScope(), "chalk_debug"):
+  if getChalkScope() != nil and get[bool](getChalkScope(), "chalk_debug"):
     cantLoad(err & "\n" & tb)
   else:
     cantLoad(err)

diff --git a/src/sinks.nim b/src/sinks.nim
@@ -42,7 +42,7 @@ proc chalkErrFilter*(msg: string, info: StringTable): (string, bool) =
   if not getSuspendLogging() and keyLogLevel in info:
     let llStr = info[keyLogLevel]
 
-    if (llStr in toLogLevelMap) and chalkConfig != nil and
+    if (llStr in toLogLevelMap) and getChalkScope() != nil and
      (toLogLevelMap[llStr] <= toLogLevelMap[get[string](getChalkScope(), "chalk_log_level")]):
       return (msg, true)
 
@@ -148,7 +148,7 @@ proc ioErrorHandler(cfg: SinkConfig, t: Topic, msg, err, tb: string) =
     error(toOut)
   else:
     trace(toOut)
-  if chalkConfig != nil and get[bool](getChalkScope(), "chalk_debug"):
+  if getChalkScope() != nil and get[bool](getChalkScope(), "chalk_debug"):
     publish("debug", tb)
 
 proc successHandler(cfg: SinkConfig, t: Topic, errmsg: string) =