Add the ability to filter by log level and namespace.

slfmt.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.1.1"
+version       = "0.1.2"
 author        = "Jonathan Bernard"
 description   = "Small utility to pretty-print strucutured logs."
 license       = "MIT"
@@ -10,5 +10,5 @@ bin           = @["slfmt"]
 
 # Dependencies
 
-requires "nim >= 2.2.0"
+requires @["nim >= 2.2.0", "docopt"]
 requires "timeutils"

src/slfmt.nim

@@ -1,19 +1,34 @@
-import std/[json, sequtils, streams, strutils, terminal, times]
+import std/[json, options, sequtils, streams, strutils, terminal, times]
 import timeutils
-#import docopt
+import docopt
 
-const VERSION = "0.1.0"
+from std/logging import Level
 
-# const USAGE = """Usage:
+const VERSION = "0.1.2"
-#   slfmt
+
-#
+const USAGE = """Usage:
-# Options:
+   slfmt [options]
-#
+
-#   -h, --help            Print this usage and help information
+Options:
+
+   -h, --help               Print this usage and help information
+   -l, --log-level <lvl>    Only show log events at or above this level
+   -n, --namespace <ns>     Only show log events from this namespace
+"""
 
 const fieldDisplayOrder = @[
   "scope", "level", "ts", "code", "sid", "sub", "msg", "err", "stack", "method", "args"]
 
+func parseLogLevel(s: string): Level =
+  case s.toUpper
+  of "DEBUG": result = Level.lvlDebug
+  of "INFO": result = Level.lvlInfo
+  of "NOTICE": result = Level.lvlNotice
+  of "WARN": result = Level.lvlWarn
+  of "ERROR": result = Level.lvlError
+  of "FATAL": result = Level.lvlFatal
+  else: result = Level.lvlAll
+
 func decorate(
     s: string,
     fg = fgDefault,
@@ -42,38 +57,60 @@ proc formatField(name: string, value: JsonNode): string =
     of "err": strVal = decorate(value.getStr, fgRed)
     of "msg": strVal = decorate(value.getStr, fgYellow)
     of "stack": strVal = decorate(value.getStr, fgBlack, {styleBright})
-    else: strVal = pretty(value)
+    else:
+      if value.kind == JString: strVal = decorate(value.getStr)
+      else: strVal = pretty(value)
 
   let valLines = splitLines(strVal)
   if name.len > 10 or strVal.len + 16 > terminalWidth() or valLines.len > 1:
     result &= "\n" & valLines.mapIt("  " & it).join("\n") & "\n"
   else: result &= strVal & "\n"
 
-proc prettyPrintFormat(logLine: string): string =
+proc prettyPrintFormat(logJson: JsonNode): string =
-  try:
+  result = '-'.repeat(terminalWidth()) & "\n"
-    var logJson = parseJson(logLine)
 
-    result = '-'.repeat(terminalWidth()) & "\n"
+  # Print the known fields in order first
+  for f in fieldDisplayOrder:
+    if logJson.hasKey(f):
+      result &= formatField(f, logJson[f])
+      logJson.delete(f)
 
-    # Print the known fields in order first
+  # Print the rest of the fields
-    for f in fieldDisplayOrder:
+  for (key, val) in pairs(logJson): result &= formatField(key, val)
-      if logJson.hasKey(f):
-        result &= formatField(f, logJson[f])
-        logJson.delete(f)
 
-    # Print the rest of the fields
+  result &= "\n"
-    for (key, val) in pairs(logJson): result &= formatField(key, val)
 
-    result &= "\n"
+proc parseLogLine(logLine: string): JsonNode =
-
+  result = parseJson(logLine)
-  except ValueError, JsonParsingError:
-    result = logLine
 
 when isMainModule:
   try:
+    let args = docopt(USAGE, version = VERSION)
+
+    let logLevel =
+      if args["--log-level"]: some(parseLogLevel($args["--log-level"]))
+      else: none[Level]()
+
+    let namespace =
+      if args["--namespace"]: some($args["--namespace"])
+      else: none[string]()
+
     var line: string = ""
     let sin = newFileStream(stdin)
-    while(sin.readLine(line)): stdout.writeLine(prettyPrintFormat(line))
+    while(sin.readLine(line)):
+      try:
+        let logJson = parseLogLine(line)
+
+        if logLevel.isSome and logJson.hasKey("level"):
+          let lvl = parseLogLevel(logJson["level"].getStr)
+          if lvl < logLevel.get: continue
+
+        if namespace.isSome and logJson.hasKey("scope"):
+          if not logJson["scope"].getStr.startsWith(namespace.get): continue
+
+        stdout.writeLine(prettyPrintFormat(logJson))
+      except ValueError, JsonParsingError:
+        stdout.writeLine(line)
   except:
     stderr.writeLine("slfmt - FATAL: " & getCurrentExceptionMsg())
     stderr.writeLine(getCurrentException().getStackTrace())