cloud-mu 3.1.6 → 3.2.0

data/modules/mu/config/storage_pool.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/storage_pool.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/storage_pool.rb
     class StoragePool
 
       # Base configuration schema for a StoragePool

data/modules/mu/config/tail.rb

@@ -117,6 +117,16 @@ module MU
       def gsub(*args)
         to_s.gsub(*args)
       end
+
+      # Lets callers access us like a {Hash}
+      # @param attribute [String,Symbol]
+      def [](attribute)
+        if respond_to?(attribute.to_sym)
+          send(attribute.to_sym)
+        else
+          nil
+        end
+      end
     end
 
     # Wrapper method for creating a {MU::Config::Tail} object as a reference to

data/modules/mu/config/user.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/user.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/user.rb
     class User
 
       # Base configuration schema for a User

data/modules/mu/config/vpc.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/vpc.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/vpc.rb
     class VPC
 
       # Base configuration schema for a VPC
@@ -419,7 +419,7 @@ module MU
           if configurator.updating and configurator.existing_deploy and
              configurator.existing_deploy.original_config['vpcs']
             configurator.existing_deploy.original_config['vpcs'].each { |v|
-              if v['name'] == vpc['name']
+              if v['name'].to_s == vpc['name'].to_s
                 vpc['ip_block'] = v['ip_block']
                 vpc['peers'] ||= []
                 vpc['peers'].concat(v['peers'])
@@ -431,6 +431,10 @@ module MU
                 break
               end
             }
+            if !vpc['ip_block']
+              MU.log "Loading existing deploy but can't find IP block of VPC #{vpc['name']}", MU::ERR
+              ok = false
+            end
           else
             using_default_cidr = true
             vpc['ip_block'] = "10.0.0.0/16"
@@ -539,7 +543,7 @@ module MU
           # Clouds that don't have some kind of native NAT gateway can also
           # leverage this host to honor "gateway" => "#NAT" situations.
           if !can_peer and !already_peered and have_public and vpc["create_bastion"]
-            serverclass = Object.const_get("MU").const_get("Cloud").const_get(vpc["cloud"]).const_get("Server")
+            serverclass = MU::Cloud.resourceClass(vpc["cloud"], "Server")
             bastion = serverclass.genericNAT.dup
             bastion["groomer_variables"] = {
               "nat_ip_block" => vpc["ip_block"].to_s
@@ -558,10 +562,7 @@ module MU
               "name" => vpc["name"],
               "subnet_pref" => "public"
             }
-            vpc["dependencies"] << {
-              "type" => "server",
-              "name" => bastion['name'],
-            }
+            MU::Config.addDependency(vpc, bastion['name'], "server", no_create_wait: true)
             vpc["bastion"] = MU::Config::Ref.get(
               name: bastion['name'],
               cloud: vpc['cloud'],
@@ -596,7 +597,7 @@ module MU
               MU.log "Skipping malformed VPC peer in #{vpc['name']}", MU::ERR, details: peer
               next
             end
-            peer["#MU_CLOUDCLASS"] = Object.const_get("MU").const_get("Cloud").const_get("VPC")
+            peer["#MU_CLOUDCLASS"] = MU::Cloud.loadBaseType("VPC")
             # We check for multiple siblings because some implementations
             # (Google) can split declared VPCs into parts to get the mimic the
             # routing behaviors we expect.
@@ -613,17 +614,11 @@ module MU
                     append_me = { "vpc" => peer["vpc"].dup }
                     append_me['vpc']['name'] = sib['name']
                     append << append_me
-                    vpc["dependencies"] << {
-                      "type" => "vpc",
-                      "name" => sib['name']
-                    }
+                    MU::Config.addDependency(vpc, sib['name'], "vpc", phase: "groom", no_create_wait: true)
                   end
                   delete << peer
                 else
-                  vpc["dependencies"] << {
-                    "type" => "vpc",
-                    "name" => peer['vpc']["name"]
-                  }
+                  MU::Config.addDependency(vpc, peer['vpc']['name'], "vpc", phase: "groom", no_create_wait: true)
                 end
                 delete << peer if sib['name'] == vpc['name']
               }
@@ -800,7 +795,7 @@ MU.log "VPC lookup cache hit", MU::WARN, details: vpc_block
               @@reference_cache[vpc_block] ||= ext_vpc if ok
             end
           rescue StandardError => e
-            raise MuError, e.inspect, [caller, e.backtrace]
+            raise MuError.new e.inspect, details: { "my call stack" => caller, "exception call stack" => e.backtrace }
           ensure
             if !ext_vpc and vpc_block['cloud'] != "CloudFormation"
               MU.log "Couldn't resolve VPC reference to a unique live VPC in #{parent_type} #{parent['name']} (called by #{caller[0]})", MU::ERR, details: vpc_block

data/modules/mu/defaults/AWS.yaml

@@ -17,39 +17,39 @@ rhel71: &4
   us-west-1: ami-04898e596c06e802b
   us-west-2: ami-02db5457189a8a8c2
 centos6: &3
-  us-east-1: ami-06b6c01abc6998348
-  ap-northeast-1: ami-0c5da73fde2cb6437
-  ap-northeast-2: ami-0134fce6dc00eb00d
-  ap-south-1: ami-0e59a612e7c84836b
-  ap-southeast-1: ami-0e16974f528ae0dae
-  ap-southeast-2: ami-0e2feddf3dbf4d539
-  ca-central-1: ami-089236a344dadad5f
-  eu-central-1: ami-0c4eed3fe046c3917
-  eu-north-1: ami-05f636e89d0362c14
-  eu-west-1: ami-00c50b11d713f90d3
-  eu-west-2: ami-06cc78c32eed7f944
-  eu-west-3: ami-0ba626236ad786c54
-  sa-east-1: ami-07c3b2a5a41e92376
-  us-east-2: ami-01129e636778acfbc
-  us-west-1: ami-0632e646cd5089ffc
-  us-west-2: ami-0ce4c9f2e1037de53
+  us-east-1: ami-0ccdc671f12147a1d
+  us-east-2: ami-00d0e8bc2f05ab949
+  ap-northeast-1: ami-0726801ceef87f5f8
+  ap-northeast-2: ami-05fa4afc4a0493b0a
+  ap-south-1: ami-0d6e4f3b6592b3139
+  ap-southeast-1: ami-0c988e3dc80b14653
+  ap-southeast-2: ami-02ac856fd094675ef
+  ca-central-1: ami-0ce7e343953af2292
+  eu-central-1: ami-0ce8317423cea27b8
+  eu-north-1: ami-0a923b493d5fc9743
+  eu-west-1: ami-06e0f02328921c865
+  eu-west-2: ami-07ae118c8814df140
+  eu-west-3: ami-03c1017cd1ccc6e9d
+  sa-east-1: ami-05212ae133b9c3ba1
+  us-west-1: ami-0b05ec54412b9f8b0
+  us-west-2: ami-0447e036b102b2ca0
 centos7:
-  us-east-1: ami-07e6f661e71ad964b
-  ap-northeast-1: ami-0988180d74897c639
-  ap-northeast-2: ami-0e77cd1c7024b8ae0
-  ap-south-1: ami-02bd479122041000a
-  ap-southeast-1: ami-017767778ef9db671
-  ap-southeast-2: ami-05b09a58c3964d67d
-  ca-central-1: ami-0a59a176d810fcc5f
-  eu-central-1: ami-0b48a421fb05d96af
-  eu-north-1: ami-02337601ea5dc4a5d
-  eu-west-1: ami-0b0a55b7423eeac07
-  eu-west-2: ami-060518b40b25b9eb4
-  eu-west-3: ami-060957bb3adacd831
-  sa-east-1: ami-0c706132b35071de6
-  us-east-2: ami-0db4c266ed0bb958b
-  us-west-1: ami-0980f6eb52c998793
-  us-west-2: ami-07f2ed4755c01c05c
+  us-east-1: ami-067256ca1497c924d
+  ap-northeast-1: ami-07c1e51354fdfd362
+  ap-northeast-2: ami-042b761c93d6df2f1
+  ap-south-1: ami-02e879f52322e7c98
+  ap-southeast-1: ami-0487e9f84d0ffde89
+  ap-southeast-2: ami-0e854dab39fd6a427
+  ca-central-1: ami-05a27d311b585a70b
+  eu-central-1: ami-0e396d00c787b4f47
+  eu-north-1: ami-087763a2ba60b2bfe
+  eu-west-1: ami-04e3bd9335a14e635
+  eu-west-2: ami-0efd34a8d1fc2b104
+  eu-west-3: ami-08d0bcbc780448cf8
+  sa-east-1: ami-0284f4a0968263cf0
+  us-east-2: ami-0292786917d1e3015
+  us-west-1: ami-0ba622529dcdff2bb
+  us-west-2: ami-079a309ca6261d7f6
 ubuntu16: &2
   us-east-1: ami-bcdc16c6
   us-west-1: ami-1b17257b

data/modules/mu/defaults/Azure.yaml

@@ -2,6 +2,7 @@
 centos6: &centos6 OpenLogic/CentOS/6
 #centos7: &centos7 westernoceansoftwaresprivatelimited/centos-7-6/centos-7-6-server
 centos7: &centos7 OpenLogic/CentOS/7
+centos8: &centos7 OpenLogic/CentOS/8
 rhel8: &rhel8 RedHat/RHEL/8
 rhel7: &rhel7 RedHat/RHEL/7
 rhel6: &rhel6 RedHat/RHEL/6

data/modules/mu/defaults/Google.yaml

@@ -1,6 +1,7 @@
 ---
 centos6: &centos6 egt-labs-admin/mu-centos-6
 centos7: &centos7 egt-labs-admin/mu-centos-7
+centos8: &centos8 centos-cloud/centos-8 
 rhel71: &rhel71 rhel-cloud/rhel-7
 rhel6: &rhel6 rhel-cloud/rhel-6
 debian10: &debian10 debian-cloud/debian-10

data/modules/mu/deploy.rb

@@ -157,6 +157,7 @@ module MU
           _shortclass, _cfg_name, _cfg_plural, classname = MU::Cloud.getResourceNames(data[:cfg_plural])
           @main_config[data[:cfg_plural]].each { |resource|
             resource["#MU_CLOUDCLASS"] = classname
+#            resource["#MU_CLOUDCLASS"] = MU::Cloud.resourceClass(resource['cloud'], data[:cfg_plural])
           }
           setThreadDependencies(@main_config[data[:cfg_plural]])
         end
@@ -265,7 +266,7 @@ module MU
         # Run cloud provider-specific deploy meta-artifact creation (ssh keys,
         # resource groups, etc)
         @mommacat.cloudsUsed.each { |cloud|
-          cloudclass = Object.const_get("MU").const_get("Cloud").const_get(cloud)
+          cloudclass = MU::Cloud.cloudClass(cloud)
           cloudclass.initDeploy(@mommacat)
         }
 
@@ -554,16 +555,9 @@ MESSAGE_END
         @dependency_threads["#{name}_groom"]=["#{name}_create", "mu_groom_container"]
 
         MU.log "Setting dependencies for #{name}", MU::DEBUG, details: resource["dependencies"]
-        if resource["dependencies"] != nil then
+        if !resource["dependencies"].nil? then
           resource["dependencies"].each { |dependency|
-            parent_class = nil
-            MU::Cloud.resource_types.each_pair { |res_class, attrs|
-              if attrs[:cfg_name] == dependency['type'] or
-                 attrs[:cfg_plural] == dependency['type']
-                parent_class = Object.const_get("MU").const_get("Cloud").const_get(res_class)
-                break
-              end
-            }
+            parent_class = MU::Cloud.loadBaseType(dependency['type'])
 
             parent_type = parent_class.cfg_name
 
@@ -572,10 +566,10 @@ MESSAGE_END
             addDependentThread(parent, "#{name}_groom")
 
             # should our creation thread also wait on our parent's create?
-            if !resource["no_create_wait"] and
+            if !dependency["no_create_wait"] and
                (resource["#MU_CLOUDCLASS"].waits_on_parent_completion or
                dependency['phase'] == "create" or
-               (parent_class.deps_wait_on_my_creation and parent_type != res_type))
+               parent_class.deps_wait_on_my_creation)
               addDependentThread(parent, "#{name}_create")
             end
 
@@ -584,12 +578,18 @@ MESSAGE_END
             if (dependency['phase'] == "groom" or resource["#MU_CLOUDCLASS"].waits_on_parent_completion) and parent_class.instance_methods(false).include?(:groom)
               parent = parent_type+"_"+dependency["name"]+"_groom"
               addDependentThread(parent, "#{name}_groom")
-              if (parent_class.deps_wait_on_my_creation and parent_type != res_type) or resource["#MU_CLOUDCLASS"].waits_on_parent_completion or dependency['phase'] == "groom"
+              if !dependency["no_create_wait"] and (
+                   parent_class.deps_wait_on_my_creation or
+                   resource["#MU_CLOUDCLASS"].waits_on_parent_completion or
+                   dependency['phase'] == "groom"
+                 )
                 addDependentThread(parent, "#{name}_create")
               end
             end
           }
         end
+        MU.log "Thread dependencies #{res_type}[#{name}]", MU::DEBUG, details: { "create" => @dependency_threads["#{name}_create"], "groom" => @dependency_threads["#{name}_groom"] }
+        @dependency_threads["#{name}_groom"]=["#{name}_create", "mu_groom_container"]
       }
     end
 
@@ -651,8 +651,9 @@ MESSAGE_END
               run_this_method = myservice['#MUOBJECT'].method(mode)
             rescue StandardError => e
               MU::MommaCat.unlockAll
-              @main_thread.raise MuError, "Error invoking #{myservice["#MU_CLOUDCLASS"]}.#{mode} for #{myservice['name']} (#{e.inspect})", e.backtrace
-              raise e
+              @main_thread.raise MuError, "Error invoking #{myservice["#MUOBJECT"].class.name}.#{mode} for #{myservice['name']} (#{e.inspect})", e.backtrace
+              return
+#              raise e
             end
             begin
               MU.log "Checking whether to run #{myservice['#MUOBJECT']}.#{mode} (updating: #{@updating})", MU::DEBUG

data/modules/mu/groomer.rb

@@ -30,6 +30,21 @@ module MU
       ["Chef", "Ansible"]
     end
 
+    # List of known/supported groomers which are installed and appear to be working
+    # @return [Array<String>]
+    def self.availableGroomers
+      available = []
+      MU::Groomer.supportedGroomers.each { |groomer|
+        begin
+          groomerbase = loadGroomer(groomer)
+          available << groomer if groomerbase.available?
+        rescue LoadError
+        end
+      }
+
+      available
+    end
+
     # Instance methods that any Groomer plugin must implement
     def self.requiredMethods
       [:preClean, :bootstrap, :haveBootstrapped?, :run, :saveDeployData, :getSecret, :saveSecret, :deleteSecret, :reinstall]

data/modules/mu/groomers/chef.rb

@@ -805,6 +805,9 @@ retry
         end
       end
 
+      # Purge Chef resources matching a particular deploy
+      # @param deploy_id [String]
+      # @param noop [Boolean]
       def self.cleanup(deploy_id, noop = false)
         return nil if deploy_id.nil? or deploy_id.empty?
         begin

data/modules/mu/logger.rb

@@ -33,6 +33,33 @@ module MU
     # Show DEBUG log entries and extra call stack and threading info
     LOUD = 2.freeze
 
+    # stash a hash map for color outputs
+    COLORMAP = {
+      MU::DEBUG => { :html => "orange", :ansi => :yellow },
+      MU::INFO => { :html => "green", :ansi => :green },
+      MU::NOTICE => { :html => "yellow", :ansi => :yellow },
+      MU::WARN => { :html => "orange", :ansi => :light_red },
+      MU::ERR => { :html => "red", :ansi => :red }
+    }.freeze
+
+    # minimum log verbosity at which we'll print various types of messages
+    PRINT_MSG_IF = {
+      MU::DEBUG => { :msg => LOUD, :details => LOUD },
+      MU::INFO => { :msg => NORMAL, :details => LOUD },
+      MU::NOTICE => { :msg => nil, :details => QUIET },
+      MU::WARN => { :msg => nil, :details => SILENT },
+      MU::ERR => { :msg => nil, :details => nil }
+    }.freeze
+
+    # Syslog equivalents of our log levels
+    SYSLOG_MAP = {
+      MU::DEBUG => Syslog::LOG_DEBUG,
+      MU::INFO => Syslog::LOG_NOTICE,
+      MU::NOTICE => Syslog::LOG_NOTICE,
+      MU::WARN => Syslog::LOG_WARNING,
+      MU::ERR => Syslog::LOG_ERR
+    }.freeze
+
     attr_accessor :verbosity
     @verbosity = MU::Logger::NORMAL
     @quiet = false
@@ -76,59 +103,28 @@ module MU
       html ||= @html
       handle ||= @handle
       color ||= @color
-      return if verbosity == MU::Logger::SILENT
-      return if verbosity < MU::Logger::LOUD and level == DEBUG
-      return if verbosity < MU::Logger::NORMAL and level == INFO
 
-      # By which we mean, "get the filename (with the .rb stripped off) which
-      # originated the call to this method. Which, for our purposes, is the
-      # MU subclass that called us. Useful information. And it looks like Perl.
-      mod_root = Regexp.quote("#{ENV['MU_LIBDIR']}/modules/mu/")
-      bin_root = Regexp.quote("#{ENV['MU_INSTALLDIR']}/bin/")
-      caller_name = caller[1]
+      if verbosity == MU::Logger::SILENT or (verbosity < MU::Logger::LOUD and level == DEBUG) or (verbosity < MU::Logger::NORMAL and level == INFO)
+        return
+      end
 
-      caller_name.sub!(/:.*/, "")
-      caller_name.sub!(/^\.\//, "")
-      caller_name.sub!(/^#{mod_root}/, "")
-      caller_name.sub!(/^#{bin_root}/, "")
-      caller_name.sub!(/\.r[ub]$/, "")
-      caller_name.sub!(/#{Regexp.quote(MU.myRoot)}\//, "")
-      caller_name.sub!(/^modules\//, "")
+      if level == SUMMARY
+        @summary << msg
+        return
+      end
+
+      caller_name = extract_caller_name(caller[1])
 
       time = Time.now.strftime("%b %d %H:%M:%S").to_s
 
       Syslog.open("Mu/"+caller_name, Syslog::LOG_PID, Syslog::LOG_DAEMON | Syslog::LOG_LOCAL3) if !Syslog.opened?
-      if !details.nil?
-        if details.is_a?(Hash) and details.has_key?(:details)
-          details = details[:details]
-        end
-        details = PP.pp(details, '') if !details.is_a?(String)
-      end
-      details = "<pre>"+details+"</pre>" if html
-      # We get passed literal quoted newlines sometimes, fix 'em. Get Windows'
-      # ugly line feeds too.
-      if !details.nil?
-        details = details.dup # in case it's frozen or something
-        details.gsub!(/\\n/, "\n")
-        details.gsub!(/(\\r|\r)/, "")
-      end
+
+      details = format_details(details, html)
 
       msg = msg.first if msg.is_a?(Array)
       msg = "" if msg == nil
       msg = msg.to_s if !msg.is_a?(String) and msg.respond_to?(:to_s)
 
-      # wrapper for writing a log entry to multiple filehandles
-      # @param handles [Array<IO>]
-      # @param msgs [Array<String>]
-      def write(handles = [], msgs = [])
-        return if handles.nil? or msgs.nil?
-        handles.each { |h|
-          msgs.each { |m|
-            h.puts m
-          }
-        }
-      end
-
       @@log_semaphere.synchronize {
         handles = [handle]
         extra_logfile = if deploy and deploy.deploy_dir and Dir.exist?(deploy.deploy_dir)
@@ -137,110 +133,41 @@ module MU
         handles << extra_logfile if extra_logfile
         msgs = []
 
-        case level
-          when SUMMARY
-            @summary << msg
-          when DEBUG
-            if verbosity >= MU::Logger::LOUD
-              if html
-                html_out "#{time} - #{caller_name} - #{msg}", "orange"
-                html_out "&nbsp;#{details}" if details
-              elsif color
-                msgs << "#{time} - #{caller_name} - #{msg}".yellow.on_black
-                msgs << "#{details}".white.on_black if details
-              else
-                msgs << "#{time} - #{caller_name} - #{msg}"
-                msgs << "#{details}" if details
-              end
-              Syslog.log(Syslog::LOG_DEBUG, msg.gsub(/%/, ''))
-              Syslog.log(Syslog::LOG_DEBUG, details.gsub(/%/, '')) if details
-            end
-          when INFO
-            if verbosity >= MU::Logger::NORMAL
-              if html
-                html_out "#{time} - #{caller_name} - #{msg}", "green"
-              elsif color
-                msgs << "#{time} - #{caller_name} - #{msg}".green.on_black
-              else
-                msgs << "#{time} - #{caller_name} - #{msg}"
-              end
-              if verbosity >= MU::Logger::LOUD
-                if html
-                  html_out "&nbsp;#{details}"
-                elsif color
-                  msgs << "#{details}".white.on_black if details
-                else
-                  msgs << "#{details}" if details
-                end
-              end
-              Syslog.log(Syslog::LOG_NOTICE, msg.gsub(/%/, ''))
-              Syslog.log(Syslog::LOG_NOTICE, details.gsub(/%/, '')) if details
-            end
-          when NOTICE
-            if html
-              html_out "#{time} - #{caller_name} - #{msg}", "yellow"
-            elsif color
-              msgs << "#{time} - #{caller_name} - #{msg}".yellow.on_black
-            else
-              msgs << "#{time} - #{caller_name} - #{msg}"
-            end
-            if verbosity >= MU::Logger::QUIET
-              if html
-                html_out "#{caller_name} - #{msg}"
-              elsif color
-                msgs << "#{details}".white.on_black if details
-              else
-                msgs << "#{details}" if details
-              end
-            end
-            Syslog.log(Syslog::LOG_NOTICE, msg.gsub(/%/, ''))
-            Syslog.log(Syslog::LOG_NOTICE, details.gsub(/%/, '')) if details
-          when WARN
-            if html
-              html_out "#{time} - #{caller_name} - #{msg}", "orange"
-            elsif color
-              msgs << "#{time} - #{caller_name} - #{msg}".light_red.on_black
-            else
-              msgs << "#{time} - #{caller_name} - #{msg}"
-            end
-            if verbosity >= MU::Logger::SILENT
-              if html
-                html_out "#{caller_name} - #{msg}"
-              elsif color
-                msgs << "#{details}".white.on_black if details
-              else
-                msgs << "#{details}" if details
-              end
-            end
-            Syslog.log(Syslog::LOG_WARNING, msg.gsub(/%/, ''))
-            Syslog.log(Syslog::LOG_WARNING, details.gsub(/%/, '')) if details
-          when ERR
-            if html
-              html_out "#{time} - #{caller_name} - #{msg}", "red"
-              html_out "&nbsp;#{details}" if details
-            elsif color
-              msgs << "#{time} - #{caller_name} - #{msg}".red.on_black
-              msgs << "#{details}".white.on_black if details
-            else
-              msgs << "#{time} - #{caller_name} - #{msg}"
-              msgs << "#{details}" if details
-            end
-            Syslog.log(Syslog::LOG_ERR, msg.gsub(/%/, ''))
-            Syslog.log(Syslog::LOG_ERR, details.gsub(/%/, '')) if details
+        if !PRINT_MSG_IF[level][:msg] or level >= PRINT_MSG_IF[level][:msg]
+          if html
+            html_out "#{time} - #{caller_name} - #{msg}", COLORMAP[level][:html]
+          else
+            str = "#{time} - #{caller_name} - #{msg}"
+            str = str.send(COLORMAP[level][:ansi]).on_black if color
+            msgs << str
+          end
+          Syslog.log(SYSLOG_MAP[level], msg.gsub(/%/, ''))
+        end
+
+        if details and (!PRINT_MSG_IF[level][:details] or level >= PRINT_MSG_IF[level][:details])
+          if html
+            html_out "&nbsp;#{details}"
           else
-            if html
-              html_out "#{time} - #{caller_name} - #{msg}"
-              html_out "&nbsp;#{details}" if details
-            elsif color
-              msgs << "#{time} - #{caller_name} - #{msg}".white.on_black
-              msgs << "#{details}".white.on_black if details
-            else
-              msgs << "#{time} - #{caller_name} - #{msg}"
-              msgs << "#{details}" if details
-            end
-            Syslog.log(Syslog::LOG_NOTICE, msg.gsub(/%/, ''))
-            Syslog.log(Syslog::LOG_NOTICE, details.gsub(/%/, '')) if details
+            details = details.white.on_black if color
+            msgs << details
+          end
+          Syslog.log(SYSLOG_MAP[level], details.gsub(/%/, ''))
         end
+
+#          else
+#            if html
+#              html_out "#{time} - #{caller_name} - #{msg}"
+#              html_out "&nbsp;#{details}" if details
+#            elsif color
+#              msgs << "#{time} - #{caller_name} - #{msg}".white.on_black
+#              msgs << "#{details}".white.on_black if details
+#            else
+#              msgs << "#{time} - #{caller_name} - #{msg}"
+#              msgs << "#{details}" if details
+#            end
+#            Syslog.log(Syslog::LOG_NOTICE, msg.gsub(/%/, ''))
+#            Syslog.log(Syslog::LOG_NOTICE, details.gsub(/%/, '')) if details
+
         write(handles, msgs)
 
         extra_logfile.close if extra_logfile
@@ -250,6 +177,43 @@ module MU
 
     private
 
+    def format_details(details, html = false)
+      return if details.nil?
+
+      if details.is_a?(Hash) and details.has_key?(:details)
+        details = details[:details]
+      end
+      details = PP.pp(details, '') if !details.is_a?(String)
+
+      details = "<pre>"+details+"</pre>" if html
+      # We get passed literal quoted newlines sometimes, fix 'em. Get Windows'
+      # ugly line feeds too.
+
+      details = details.dup # in case it's frozen or something
+      details.gsub!(/\\n/, "\n")
+      details.gsub!(/(\\r|\r)/, "")
+
+      details
+    end
+
+    # By which we mean, "get the filename (with the .rb stripped off) which
+    # originated the call to this method. Which, for our purposes, is the
+    # MU subclass that called us. Useful information. And it looks like Perl.
+    def extract_caller_name(caller_name)
+      return nil if !caller_name or !caller_name.is_a?(String)
+      mod_root = Regexp.quote("#{ENV['MU_LIBDIR']}/modules/mu/")
+      bin_root = Regexp.quote("#{ENV['MU_INSTALLDIR']}/bin/")
+
+      caller_name.sub!(/:.*/, "")
+      caller_name.sub!(/^\.\//, "")
+      caller_name.sub!(/^#{mod_root}/, "")
+      caller_name.sub!(/^#{bin_root}/, "")
+      caller_name.sub!(/\.r[ub]$/, "")
+      caller_name.sub!(/#{Regexp.quote(MU.myRoot)}\//, "")
+      caller_name.sub!(/^modules\//, "")
+      caller_name
+    end
+
     # Output a log message as HTML.
     #
     # @param msg [String]: The log message to print
@@ -259,5 +223,17 @@ module MU
       @handle.puts "<span style='color:#{rgb.css_rgb};'>#{msg}</span>"
     end
 
+    # wrapper for writing a log entry to multiple filehandles
+    # @param handles [Array<IO>]
+    # @param msgs [Array<String>]
+    def write(handles = [], msgs = [])
+      return if handles.nil? or msgs.nil?
+      handles.each { |h|
+        msgs.each { |m|
+          h.puts m
+        }
+      }
+    end
+
   end #class
 end #module