better logging for compiling

log.ce

@@ -2,6 +2,9 @@
 //
 // Usage:
 //   cell log list                          List configured sinks
+//   cell log channels                      List channels with status
+//   cell log enable <channel>              Enable a channel on terminal
+//   cell log disable <channel>             Disable a channel on terminal
 //   cell log add <name> console [opts]     Add a console sink
 //   cell log add <name> file <path> [opts] Add a file sink
 //   cell log remove <name>                 Remove a sink
@@ -46,6 +49,9 @@ function print_help() {
   log.console("")
   log.console("Commands:")
   log.console("  list                             List configured sinks")
+  log.console("  channels                         List channels with status")
+  log.console("  enable <channel>                 Enable a channel on terminal")
+  log.console("  disable <channel>                Disable a channel on terminal")
   log.console("  add <name> console [opts]        Add a console sink")
   log.console("  add <name> file <path> [opts]    Add a file sink")
   log.console("  remove <name>                    Remove a sink")
@@ -328,6 +334,128 @@ function do_tail() {
   poll()
 }
 
+var known_channels = ["console", "error", "warn", "system", "build", "shop", "compile", "test"]
+
+function find_terminal_sink(config) {
+  var names = null
+  var found = null
+  if (!config || !config.sink) return null
+  names = array(config.sink)
+  if (config.sink.terminal) return config.sink.terminal
+  arrfor(names, function(n) {
+    if (!found && config.sink[n].type == "console")
+      found = config.sink[n]
+  })
+  return found
+}
+
+function do_enable() {
+  var channel = null
+  var config = null
+  var sink = null
+  var i = 0
+  var already = false
+  if (length(args) < 2) {
+    log.error("Usage: cell log enable <channel>")
+    return
+  }
+  channel = args[1]
+  config = load_config()
+  if (!config) config = {sink: {}}
+  if (!config.sink) config.sink = {}
+  sink = find_terminal_sink(config)
+  if (!sink) {
+    config.sink.terminal = {type: "console", format: "clean", channels: ["console", "error", channel], stack: ["error"]}
+    save_config(config)
+    log.console("Enabled channel: " + channel)
+    return
+  }
+  if (is_array(sink.channels) && length(sink.channels) == 1 && sink.channels[0] == "*") {
+    if (is_array(sink.exclude)) {
+      var new_exclude = []
+      arrfor(sink.exclude, function(ex) {
+        if (ex != channel) push(new_exclude, ex)
+      })
+      sink.exclude = new_exclude
+    }
+  } else {
+    if (!is_array(sink.channels)) sink.channels = ["console", "error"]
+    arrfor(sink.channels, function(ch) {
+      if (ch == channel) already = true
+    })
+    if (!already) sink.channels[] = channel
+  }
+  save_config(config)
+  log.console("Enabled channel: " + channel)
+}
+
+function do_disable() {
+  var channel = null
+  var config = null
+  var sink = null
+  var i = 0
+  var new_channels = []
+  if (length(args) < 2) {
+    log.error("Usage: cell log disable <channel>")
+    return
+  }
+  channel = args[1]
+  config = load_config()
+  if (!config || !config.sink) {
+    log.error("No log configuration found")
+    return
+  }
+  sink = find_terminal_sink(config)
+  if (!sink) {
+    log.error("No terminal sink found")
+    return
+  }
+  if (is_array(sink.channels) && length(sink.channels) == 1 && sink.channels[0] == "*") {
+    if (!is_array(sink.exclude)) sink.exclude = []
+    var already_excluded = false
+    arrfor(sink.exclude, function(ex) {
+      if (ex == channel) already_excluded = true
+    })
+    if (!already_excluded) sink.exclude[] = channel
+  } else {
+    if (is_array(sink.channels)) {
+      arrfor(sink.channels, function(ch) {
+        if (ch != channel) push(new_channels, ch)
+      })
+      sink.channels = new_channels
+    }
+  }
+  save_config(config)
+  log.console("Disabled channel: " + channel)
+}
+
+function do_channels() {
+  var config = load_config()
+  var sink = null
+  var is_wildcard = false
+  var active = {}
+  if (config) sink = find_terminal_sink(config)
+  if (sink) {
+    if (is_array(sink.channels) && length(sink.channels) == 1 && sink.channels[0] == "*") {
+      is_wildcard = true
+      arrfor(known_channels, function(ch) { active[ch] = true })
+      if (is_array(sink.exclude)) {
+        arrfor(sink.exclude, function(ex) { active[ex] = false })
+      }
+    } else if (is_array(sink.channels)) {
+      arrfor(sink.channels, function(ch) { active[ch] = true })
+    }
+  } else {
+    active.console = true
+    active.error = true
+  }
+  log.console("Channels:")
+  arrfor(known_channels, function(ch) {
+    var status = active[ch] ? "enabled" : "disabled"
+    log.console("  " + ch + ": " + status)
+  })
+}
+
 // Main dispatch
 if (length(args) == 0) {
   print_help()
@@ -335,6 +463,12 @@ if (length(args) == 0) {
   print_help()
 } else if (args[0] == 'list') {
   do_list()
+} else if (args[0] == 'channels') {
+  do_channels()
+} else if (args[0] == 'enable') {
+  do_enable()
+} else if (args[0] == 'disable') {
+  do_disable()
 } else if (args[0] == 'add') {
   do_add()
 } else if (args[0] == 'remove') {