MuranoCLI 3.0.7 → 3.0.8

data/lib/MrMurano/Webservice-Cors.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'json'
 require 'yaml'

data/lib/MrMurano/Webservice-Endpoint.rb

@@ -1,12 +1,13 @@
-# Last Modified: 2017.09.07 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'json'
 require 'net/http'
+require 'pathname'
 require 'pp'
 require 'uri'
 require 'MrMurano/SyncRoot'
@@ -43,7 +44,7 @@ module MrMurano
       end
 
       ##
-      # This gets all data about all endpoints
+      # This gets all data about all endpoints.
       def list
         ret = get
         return [] unless ret.is_a?(Array)
@@ -68,6 +69,7 @@ module MrMurano
 
         ret[:content_type] = 'application/json' if ret[:content_type].empty?
 
+        add_terminating_nl = ret[:script].end_with? "\n"
         script = ret[:script].lines.map(&:chomp)
 
         aheader = (script.first || '')
@@ -93,7 +95,8 @@ module MrMurano
         end
         # otherwise current header is good.
 
-        script = script.join("\n") + "\n"
+        script = script.join("\n")
+        script += "\n" if add_terminating_nl
         if block_given?
           yield script
         else

data/lib/MrMurano/Webservice-File.rb

@@ -1,14 +1,15 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'digest/sha1'
 require 'http/form_data'
 require 'mime/types'
 require 'net/http'
+require 'pathname'
 require 'uri'
 require 'MrMurano/Webservice'
 require 'MrMurano/SyncRoot'

data/lib/MrMurano/Webservice.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'uri'
 require 'MrMurano/Config'
@@ -38,7 +38,7 @@ module MrMurano
       # @return URI: The full URI for this endpoint.
       def endpoint(path='')
         super
-        parts = ['https:/', $cfg['net.host'], 'api:1'] + @uriparts
+        parts = [$cfg['net.protocol'] + ':/', $cfg['net.host'], 'api:1'] + @uriparts
         s = parts.map(&:to_s).join('/')
         URI(s + path.to_s)
       end

data/lib/MrMurano/commands/business.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.20 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/verbosing'
 require 'MrMurano/Account'

data/lib/MrMurano/commands/completion.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'erb'
 require 'pp'
@@ -77,7 +77,7 @@ class ::Commander::Runner
   # Get maximum depth of sub-commands.
   def cmdMaxDepth
     depth = 0
-    @commands.sort.each do |name, _cmd|
+    @commands.keys.sort.each do |name|
       levels = name.split
       depth = levels.count if levels.count > depth
     end
@@ -151,7 +151,7 @@ or
 #      end
 
     elsif options.subs
-      runner.instance_variable_get(:@commands).sort.each do |name, _cmd|
+      runner.instance_variable_get(:@commands).keys.sort.each do |name|
         #desc = _cmd.instance_variable_get(:@summary) #.lines[0]
         #say "#{name}:'#{desc}'"
         say name.to_s

data/lib/MrMurano/commands/config.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/ReCommander'
 
@@ -89,7 +89,9 @@ If section is left out, then key is assumed to be in the 'tool' section.
         scopes = MrMurano::Config::CFG_SCOPES if scopes.empty?
         is_wild = $cfg.wild?(args[0])
         if !is_wild
-          puts $cfg.get(args[0], scopes)
+          val = $cfg.get(args[0], scopes)
+          MrMurano::Verbose.verbose "No such key: #{args[0]}" if val.nil?
+          puts val
         else
           kvals = $cfg.get_wild(args[0], scopes)
           # LATER/2017-08-16: Honor --json option.

data/lib/MrMurano/commands/content.rb

@@ -1,10 +1,11 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
+require 'pathname'
 require 'MrMurano/Content'
 require 'MrMurano/ReCommander'
 

data/lib/MrMurano/commands/cors.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.13 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'yaml'
 require 'MrMurano/ReCommander'

data/lib/MrMurano/commands/devices.rb

@@ -1,11 +1,11 @@
-# Last Modified: 2017.10.04 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
-require 'date'
+require 'time'
 require 'MrMurano/Gateway'
 require 'MrMurano/ReCommander'
 
@@ -232,7 +232,7 @@ Enables Identifiers, creating devices, or digital shadows, in Murano.
       # representing microseconds since the epoch, e.g.,
       #    hours * mins/hour * secs/min * msec/sec * μsec/msec
       # or hours * 60        * 60       * 1000     * 1000
-      micros_since_epoch = DateTime.now.strftime('%Q').to_i * 1000
+      micros_since_epoch = (Time.now.to_f * 1_000_000).to_i
       mircos_until_purge = options.expire.to_i * 60 * 60 * 1000 * 1000
       options.expire = micros_since_epoch + mircos_until_purge
     end

data/lib/MrMurano/commands/domain.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/ReCommander'
 require 'MrMurano/Solution'

data/lib/MrMurano/commands/exchange.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.20 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'highline'
 require 'MrMurano/verbosing'

data/lib/MrMurano/commands/gb.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'pp'
 

data/lib/MrMurano/commands/globals.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/Config'
 
@@ -84,3 +84,11 @@ global_option('-V', '--verbose', %(Be chatty)) do
   $cfg['tool.verbose'] = true
 end
 
+global_option('--debug', %(Show debug messages)) do
+  $cfg['tool.debug'] = true
+end
+
+global_option('--sid VALUE', %(Override application or product ID)) do |value|
+  $cfg['application.id'] = value
+  $cfg['product.id'] = value
+end

data/lib/MrMurano/commands/init.rb

@@ -1,11 +1,12 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'erb'
+require 'pathname'
 require 'rainbow'
 require 'MrMurano/verbosing'
 require 'MrMurano/Account'

data/lib/MrMurano/commands/keystore.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/Keystore'
 require 'MrMurano/ReCommander'

data/lib/MrMurano/commands/link.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/Account'
 require 'MrMurano/ReCommander'

data/lib/MrMurano/commands/login.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.21 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/Account'
 require 'MrMurano/Config'

data/lib/MrMurano/commands/logs.rb

@@ -1,107 +1,260 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
+require 'json'
+
+require 'MrMurano/hash'
+require 'MrMurano/http'
 require 'MrMurano/makePretty'
+require 'MrMurano/verbosing'
+require 'MrMurano/Logs'
 require 'MrMurano/ReCommander'
 require 'MrMurano/Solution'
 
-command :logs do |c|
+# FIXME: (landonb): MUR-3081: Remove old http code for v3.1.0. Search: LOGS_USE_HTTP.
+LOGS_USE_HTTP = true
+
+def command_logs(c)
+  cmd_add_logs_meta(c)
+  # Add global solution flag: --type [application|product].
+  cmd_add_solntype_pickers(c, exclude_all: true)
+  cmd_add_logs_options(c)
+  c.action do |args, options|
+    c.verify_arg_count!(args)
+    logs_action(options)
+  end
+end
+
+def cmd_add_logs_meta(c)
   c.syntax = %(murano logs [--options])
   c.summary = %(Get the logs for a solution)
+  if LOGS_USE_HTTP
+    c.description = %(Get the logs for a solution.)
+  else
+    cmd_add_logs_help(c)
+  end
+end
+
+def cmd_add_logs_help(c)
   c.description = %(
-Get the logs for a solution.
-  ).strip
+    Get the logs for a solution.
 
-  # Add flag: --type [application|product].
-  cmd_add_solntype_pickers(c, exclude_all: true)
+    Each log record contains a number of fields, including the following.
+
+    Severity
+    ================================================================
+    The severity of the log message, as defined by rsyslog standard.
+
+      ID | Name          | Description
+      -- | ------------- | -----------------------------------------
+      0  | Emergency     | System is unusable
+      1  | Alert         | Action must be taken immediately
+      2  | Critical      | Critical conditions
+      3  | Error         | Error conditions
+      4  | Warning       | Warning conditions
+      5  | Notice        | Normal but significant condition
+      6  | Informational | Informational messages
+      7  | Debug         | Debug-level messages
+
+    Type
+    ================================================================
+    The type (emitter system) of the message.
+
+      Name    | Description
+      ------- | ----------------------------------------------------
+      Script  | Pegasus-Engine: on User Lua “print()” function call
+      Call    | Dispatcher: On service calls from Lua.
+      Event   | Dispatcher: On event trigger from services
+      Config  | Pegasus-API: On solution configuration change or
+              |   used service deprecation warning.
+      Service | Services generated & transmitted to Dispatcher.
 
+    Message
+    ================================================================
+    Message can be up to 64kb containing plain text describing a log
+    of the event
+
+    Service
+    ================================================================
+    The service via which the event name is coming or the service of
+    which the function is called.
+
+    Event
+    ================================================================
+    Depending on the type:
+
+      Event, Script => Event name
+      Call          => operationId
+
+    Tracking ID
+    ================================================================
+    End to end Murano processing id.
+    Used to group logs together for one endpoint request.
+  ).strip
+end
+
+def cmd_add_logs_options(c)
   c.option '-f', '--follow', %(Follow logs from server)
-  c.option '--[no-]pretty', %(Reformat JSON blobs in logs.)
+  c.option '-r', '--retry', %(Always retry the connection) unless LOGS_USE_HTTP
   c.option '--[no-]localtime', %(Adjust Timestamps to be in local time)
+  c.option '--[no-]pretty', %(Reformat JSON blobs in logs.)
   c.option '--raw', %(Don't do any formating of the log data)
-  # FIXME/2017-06-23: It'd be nice to allow :all
-  #   But then we'd have to interleave output somehow with --follow,
-  #   maybe using separate threads?
+  return if LOGS_USE_HTTP
+  c.option '--tracking', %(Include start of the Murano Tracking ID)
+  c.option '--tracking-full', %(Include the full Murano Tracking ID)
+  c.option '--http', %(Use HTTP connection [deprecated; will be removed])
+end
 
-  c.action do |args, options|
-    c.verify_arg_count!(args)
-    options.default(pretty: true, localtime: true, raw: false, type: :application)
-    cmd_defaults_solntype_pickers(options, :application)
-
-    if options.type == :application
-      sol = MrMurano::Application.new
-    elsif options.type == :product
-      sol = MrMurano::Product.new
-    else
-      MrMurano::Verbose.error "Unknown --type specified: #{options.type}"
-      exit 1
-    end
+def logs_action(options)
+  cmd_default_logs_options(options)
+  cmd_defaults_solntype_pickers(options, :application)
+  sol = cmd_get_sol!(options)
+  logs_display(sol, options)
+end
 
-    if options.follow
-      # Open a lasting connection and continually feed makePretty().
-      begin
-        sol.get('/logs?polling=true') do |request, http|
-          request['Accept-Encoding'] = 'None'
-          http.request(request) do |response|
-            remainder = ''
-            response.read_body do |chunk|
-              chunk = remainder + chunk unless remainder.empty?
-
-              # For all complete JSON blobs, make them pretty.
-              chunk.gsub!(/\{(?>[^}{]+|\g<0>)*\}/m) do |m|
-                if options.raw
-                  puts m
-                else
-                  begin
-                    js = JSON.parse(
-                      m,
-                      allow_nan: true,
-                      symbolize_names: true,
-                      create_additions: false,
-                    )
-                    puts MrMurano::Pretties.makePretty(js, options)
-                  rescue
-                    sol.error '=== JSON parse error, showing raw instead ==='
-                    puts m
-                  end
-                end
-                '' #remove (we're kinda abusing gsub here.)
-              end
-
-              # Is there an incomplete one?
-              chunk.match(/(\{.*$)/m) do |mat|
-                remainder = mat[1]
-              end
-            end
-          end
-        end
-      # rubocop:disable Lint/HandleExceptions: Do not suppress exceptions.
-      rescue Interrupt => _
+def cmd_default_logs_options(options)
+  options.default(
+    follow: false,
+    retry: false,
+    pretty: true,
+    localtime: true,
+    raw: false,
+    type: :application,
+  )
+end
+
+def cmd_get_sol!(options)
+  if options.type == :application
+    MrMurano::Application.new
+  elsif options.type == :product
+    MrMurano::Product.new
+  else
+    MrMurano::Verbose.error "Unknown --type specified: #{options.type}"
+    exit 1
+  end
+end
+
+def logs_display(sol, options)
+  if !options.follow
+    logs_once(sol, options)
+  else
+    logs_follow(sol, options)
+  end
+end
+
+def logs_once(sol, options)
+  ret = sol.get('/logs')
+  if ret.is_a?(Hash) && ret.key?(:items)
+    ret[:items].reverse.each do |line|
+      if options.raw
+        puts line
+      else
+        puts MrMurano::Pretties.MakePrettyLogsV1(line, options)
       end
+    end
+  else
+    sol.error "Could not get logs: #{ret}"
+    exit 1
+  end
+end
+
+def logs_follow(sol, options)
+  if !LOGS_USE_HTTP && !options.http
+    logs_follow_wss(sol, options)
+  else
+    logs_follow_http(sol, options)
+  end
+end
 
-    else
-      ret = sol.get('/logs')
+# FIXME: (landonb): MUR-3081: Remove old http code for v3.1.0. Search: LOGS_USE_HTTP.
+def logs_follow_http(sol, options)
+  # Open a lasting connection and continually feed MakePrettyLogsV1().
+  sol.get('/logs?polling=true') do |request, http|
+    request['Accept-Encoding'] = 'None'
+    http.request(request) do |response|
+      remainder = ''
+      response.read_body do |chunk|
+        chunk = remainder + chunk unless remainder.empty?
 
-      if ret.is_a?(Hash) && ret.key?(:items)
-        ret[:items].reverse.each do |line|
+        # For all complete JSON blobs, make them pretty.
+        chunk.gsub!(/\{(?>[^}{]+|\g<0>)*\}/m) do |m|
           if options.raw
-            puts line
+            puts m
           else
-            puts MrMurano::Pretties.makePretty(line, options)
+            begin
+              js = JSON.parse(
+                m,
+                allow_nan: true,
+                symbolize_names: true,
+                create_additions: false,
+              )
+              puts MrMurano::Pretties.MakePrettyLogsV1(js, options)
+            rescue StandardError
+              sol.error '=== JSON parse error, showing raw instead ==='
+              puts m
+            end
           end
+          '' #remove (we're kinda abusing gsub here.)
+        end
+
+        # Is there an incomplete one?
+        chunk.match(/(\{.*$)/m) do |mat|
+          remainder = mat[1]
         end
-      else
-        sol.error "Couldn't get logs: #{ret}"
-        # 2017-06-23: Shouldn't this be exit? What're we breaking out of?
-        break
       end
     end
   end
+# rubocop:disable Lint/HandleExceptions: Do not suppress exceptions.
+rescue Interrupt => _
+end
+
+# LATER/2017-12-14 (landonb): Show logs from all associated solutions.
+#   We'll have to wire all the WebSockets from within the EM.run block.
+def logs_follow_wss(sol, options)
+  formatter = get_formatter(options)
+  keep_running = true
+  while keep_running
+    keep_running = options.retry
+    logs = MrMurano::Logs::Follow.new
+    logs.run_event_loop(sol) do |line|
+      log_entry = parse_logs_line(line)
+      formatter.call(log_entry, options) unless log_entry.nil?
+    end
+  end
+end
+
+def parse_logs_line(line)
+  log_entry = JSON.parse(line)
+  elevate_hash(log_entry)
+rescue StandardError => err
+  MrMurano::Verbose.warning "Not JSON: #{err} / #{line}"
+  nil
+end
+
+def get_formatter(options)
+  if options.raw
+    method(:print_raw)
+  else
+    method(:print_pretty)
+  end
+end
+
+def print_raw(line, _options={})
+  puts line
+end
+
+def print_pretty(line, options={})
+  puts MrMurano::Pretties.MakePrettyLogsV2(line, options)
+rescue StandardError => err
+  MrMurano::Verbose.error "Failed to parse log: #{err} / #{line}"
+  raise
 end
+
+command :logs, &method(:command_logs)
 alias_command 'logs application', 'logs', '--type', 'application'
 alias_command 'logs product', 'logs', '--type', 'product'
 alias_command 'application logs', 'logs', '--type', 'application'