M admin/js/modules/info.js → admin/js/modules/info.js

@@ -19,7 +19,7 @@ var readonly = info.read_only ? m("span.label.label-success", "Yes") : m("span.label.label-danger", "No");
     var infolist = m(".col-sm-6", [m("ul.list-unstyled", [
           li("Version", info.version),
           li("Size", info.size),
-          li("Mounted Directory", info.directory, info.directory.length===0),
+          li("Mounted Directory", info.directory, info.directory === null),
           li("Log Level", info.log_level),
           li("Read-Only", readonly),
           li("Total Documents", m("span.badge", info.total_documents)),

M lib/api_v1.nim → lib/api_v1.nim

@@ -1,5 +1,5 @@ 
 import asynchttpserver2, asyncdispatch, strutils, cgi, strtabs, pegs, json, os, times
-import types, core, utils
+import types, core, utils, logger
 
 # Helper procs
 
@@ -170,7 +170,7 @@ content["offset"] = %orig_offset
     if options.orderby != "":
       content["sort"] = %options.orderby
     content["total"] = %total
-    content["execution-time"] = %(cputime()-t0)
+    content["execution_time"] = %(cputime()-t0)
     content["results"] = docs
     result.headers = ctJsonHeader()
     result.content = content.pretty
@@ -185,7 +185,10 @@ content["version"] = %(LS.appname & " v" & LS.appversion)
   content["size"] = %($((LS.file.getFileSize().float/(1024*1024)).formatFloat(ffDecimal, 2)) & " MB")
   content["read_only"] = %LS.readonly
   content["log_level"] = %LS.loglevel
-  content["directory"] = %LS.directory
+  if LS.directory == nil: 
+    content["directory"] = newJNull()
+  else: 
+    content["directory"] = %LS.directory 
   content["mount"] = %LS.mount
   content["total_documents"] = %total_docs
   content["total_tags"] = %total_tags

M lib/cli.nim → lib/cli.nim

@@ -17,8 +17,7 @@ port*: int
   operation = opRun
   directory:string = nil
   readonly = false
-  logLevelLabel = "INFO"
-  #logLevel = lvlInfo
+  logLevel = "info"
   mount = false
   reset = false
   
@@ -126,6 +125,7 @@ of "none":
               LOG.level = lvNone
             else:
               fail(103, "Invalid log level '$1'" % val)
+          loglevel = val
         of "directory", "d":
           if val == "":
             fail(104, "Directory not specified.")
@@ -162,5 +162,6 @@ LS.appversion = version
 LS.readonly = readonly
 LS.appname = appname
 LS.favicon = favicon
+LS.loglevel = loglevel
 LS.mount = mount
 LS.reset = reset

M lib/core.nim → lib/core.nim

@@ -9,7 +9,6 @@ pegs,
   strtabs,
   strutils,
   base64,
-  #logging,
   math
 import
   types,