improved logging all around.

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index 5eecf62..9068b4e 100644
--- a/lib/leap_cli.rb
+++ b/lib/leap_cli.rb
@@ -6,6 +6,7 @@ require 'core_ext/hash'
 require 'core_ext/boolean'
 require 'core_ext/nil'
 
+require 'leap_cli/log'
 require 'leap_cli/init'
 require 'leap_cli/path'
 require 'leap_cli/util'
@@ -13,14 +14,25 @@ require 'leap_cli/util/secret'
 require 'leap_cli/util/remote_command'
 require 'leap_cli/util/x509'
 
-require 'leap_cli/log'
+require 'leap_cli/remote/log_streamer'
+require 'leap_cli/logger'
+
 require 'leap_cli/ssh_key'
 require 'leap_cli/config/object'
 require 'leap_cli/config/object_list'
 require 'leap_cli/config/manager'
 
+module LeapCli::Commands; end
+
+module LeapCli
+  Util.send(:extend, LeapCli::Log)
+  Commands.send(:extend, LeapCli::Log)
+  Config::Manager.send(:include, LeapCli::Log)
+  extend LeapCli::Log
+end
+
 #
-# make 1.8 act like ruby 1.9
+# make ruby 1.9 act more like ruby 1.8
 #
 unless String.method_defined?(:to_a)
   class String