puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/util/instrumentation/data.rb

@@ -20,12 +20,19 @@ class Puppet::Util::Instrumentation::Data
     @listener.name
   end
 
-  def to_pson(*args)
-    result = {
+  def to_data_hash
+    { :name => name }.merge(@listener.respond_to?(:data) ? @listener.data : {})
+  end
+
+  def to_pson_data_hash
+    {
       'document_type' => "Puppet::Util::Instrumentation::Data",
-      'data' => { :name => name }.merge(@listener.respond_to?(:data) ? @listener.data : {})
+      'data' => to_data_hash,
     }
-    result.to_pson(*args)
+  end
+
+  def to_pson(*args)
+    to_pson_data_hash.to_pson(*args)
   end
 
   def self.from_pson(data)

data/lib/puppet/util/instrumentation/indirection_probe.rb

@@ -15,12 +15,19 @@ class Puppet::Util::Instrumentation::IndirectionProbe
     @probe_name = probe_name
   end
 
-  def to_pson(*args)
-    result = {
+  def to_data_hash
+    { :name => probe_name }
+  end
+
+  def to_pson_data_hash
+    {
       :document_type => "Puppet::Util::Instrumentation::IndirectionProbe",
-      :data => { :name => probe_name }
+      :data => to_data_hash,
     }
-    result.to_pson(*args)
+  end
+
+  def to_pson(*args)
+    to_pson_data_hash.to_pson(*args)
   end
 
   def self.from_pson(data)

data/lib/puppet/util/instrumentation/instrumentable.rb

@@ -1,4 +1,3 @@
-require 'monitor'
 require 'puppet/util/instrumentation'
 
 # This is the central point of all declared probes.
@@ -15,7 +14,7 @@ require 'puppet/util/instrumentation'
 #     end
 #   end
 module Puppet::Util::Instrumentation::Instrumentable
-  INSTRUMENTED_CLASSES = {}.extend(MonitorMixin)
+  INSTRUMENTED_CLASSES = {}
 
   attr_reader :probes
 
@@ -101,10 +100,8 @@ module Puppet::Util::Instrumentation::Instrumentable
   #   end
   #
   def probe(method, options = {})
-    INSTRUMENTED_CLASSES.synchronize {
-      (@probes ||= []) << Probe.new(method, self, options)
-      INSTRUMENTED_CLASSES[self] = @probes
-    }
+    (@probes ||= []) << Probe.new(method, self, options)
+    INSTRUMENTED_CLASSES[self] = @probes
   end
 
   def self.probes
@@ -126,18 +123,14 @@ module Puppet::Util::Instrumentation::Instrumentable
   end
 
   def self.clear_probes
-    INSTRUMENTED_CLASSES.synchronize {
-      INSTRUMENTED_CLASSES.clear
-    }
+    INSTRUMENTED_CLASSES.clear
     nil # do not leak our probes to the exterior world
   end
 
   def self.each_probe
-    INSTRUMENTED_CLASSES.synchronize {
-      INSTRUMENTED_CLASSES.each_key do |klass|
-        klass.probes.each { |probe| yield probe }
-      end
-    }
+    INSTRUMENTED_CLASSES.each_key do |klass|
+      klass.probes.each { |probe| yield probe }
+    end
     nil # do not leak our probes to the exterior world
   end
 end

data/lib/puppet/util/instrumentation/listener.rb

@@ -41,16 +41,23 @@ class Puppet::Util::Instrumentation::Listener
     { :data => @listener.data }
   end
 
-  def to_pson(*args)
-    result = {
+  def to_data_hash
+    {
+      :name => name,
+      :pattern => pattern,
+      :enabled => enabled?
+    }
+  end
+
+  def to_pson_data_hash
+    {
       :document_type => "Puppet::Util::Instrumentation::Listener",
-      :data => {
-        :name => name,
-        :pattern => pattern,
-        :enabled => enabled?
-      }
+      :data => to_data_hash,
     }
-    result.to_pson(*args)
+  end
+
+  def to_pson(*args)
+    to_pson_data_hash.to_pson(*args)
   end
 
   def self.from_pson(data)

data/lib/puppet/util/instrumentation/listeners/log.rb

@@ -1,5 +1,3 @@
-require 'monitor'
-
 # This is an example instrumentation listener that stores the last
 # 20 instrumented probe run time.
 Puppet::Util::Instrumentation.new_listener(:log) do
@@ -9,21 +7,17 @@ Puppet::Util::Instrumentation.new_listener(:log) do
   attr_accessor :last_logs
 
   def initialize
-    @last_logs = {}.extend(MonitorMixin)
+    @last_logs = {}
   end
 
   def notify(label, event, data)
     return if event == :start
     log_line = "#{label} took #{data[:finished] - data[:started]}"
-    @last_logs.synchronize {
-      (@last_logs[label] ||= []) << log_line
-      @last_logs[label].shift if @last_logs[label].length > SIZE
-    }
+    (@last_logs[label] ||= []) << log_line
+    @last_logs[label].shift if @last_logs[label].length > SIZE
   end
 
   def data
-    @last_logs.synchronize {
-      @last_logs.dup
-    }
+    @last_logs.dup
   end
 end

data/lib/puppet/util/instrumentation/listeners/performance.rb

@@ -1,30 +1,24 @@
-require 'monitor'
-
 Puppet::Util::Instrumentation.new_listener(:performance) do
 
   attr_reader :samples
 
   def initialize
-    @samples = {}.extend(MonitorMixin)
+    @samples = {}
   end
 
   def notify(label, event, data)
     return if event == :start
 
     duration = data[:finished] - data[:started]
-    samples.synchronize do
-      @samples[label] ||= { :count => 0, :max => 0, :min => nil, :sum => 0, :average => 0 }
-      @samples[label][:count] += 1
-      @samples[label][:sum] += duration
-      @samples[label][:max] = [ @samples[label][:max], duration ].max
-      @samples[label][:min] = [ @samples[label][:min], duration ].reject { |val| val.nil? }.min
-      @samples[label][:average] = @samples[label][:sum] / @samples[label][:count]
-    end
+    @samples[label] ||= { :count => 0, :max => 0, :min => nil, :sum => 0, :average => 0 }
+    @samples[label][:count] += 1
+    @samples[label][:sum] += duration
+    @samples[label][:max] = [ @samples[label][:max], duration ].max
+    @samples[label][:min] = [ @samples[label][:min], duration ].reject { |val| val.nil? }.min
+    @samples[label][:average] = @samples[label][:sum] / @samples[label][:count]
   end
 
   def data
-    samples.synchronize do
-      @samples.dup
-    end
+    @samples.dup
   end
 end

data/lib/puppet/util/limits.rb

@@ -0,0 +1,12 @@
+require 'puppet/util'
+
+module Puppet::Util::Limits
+  # @api private
+  def setpriority(priority)
+    return unless priority
+
+    Process.setpriority(0, Process.pid, priority)
+  rescue Errno::EACCES, NotImplementedError
+    Puppet.warning("Failed to set process priority to '#{priority}'")
+  end
+end

data/lib/puppet/util/lockfile.rb

@@ -31,7 +31,7 @@ class Puppet::Util::Lockfile
 
   def unlock
     if locked?
-      File.unlink(@file_path)
+      Puppet::FileSystem::File.unlink(@file_path)
       true
     else
       false
@@ -56,7 +56,7 @@ class Puppet::Util::Lockfile
   #  being overridden by child classes.
   # @return [boolean] true if the file is locked, false if it is not.
   def file_locked?()
-    File.exists? @file_path
+    Puppet::FileSystem::File.exist? @file_path
   end
   private :file_locked?
 end

data/lib/puppet/util/log.rb

@@ -1,5 +1,6 @@
 require 'puppet/util/tagging'
 require 'puppet/util/classgen'
+require 'puppet/network/format_support'
 
 # Pass feedback to the user.  Log levels are modeled after syslog's, and it is
 # expected that that will be the most common log destination.  Supports
@@ -8,6 +9,7 @@ class Puppet::Util::Log
   include Puppet::Util
   extend Puppet::Util::ClassGen
   include Puppet::Util::Tagging
+  include Puppet::Network::FormatSupport
 
   @levels = [:debug,:info,:notice,:warning,:err,:alert,:emerg,:crit]
   @loglevel = 2
@@ -165,9 +167,7 @@ class Puppet::Util::Log
     queuemessage(msg) if @destinations.length == 0
 
     @destinations.each do |name, dest|
-      threadlock(dest) do
-        dest.handle(msg)
-      end
+      dest.handle(msg)
     end
   end
 
@@ -265,7 +265,7 @@ class Puppet::Util::Log
     @level = data['level'].intern
     @message = data['message']
     @source = data['source']
-    @tags = data['tags']
+    @tags = Puppet::Util::TagSet.new(data['tags'])
     @time = data['time']
     if @time.is_a? String
       @time = Time.parse(@time)
@@ -274,7 +274,11 @@ class Puppet::Util::Log
     @line = data['line'] if data['line']
   end
 
-  def to_pson
+  def to_hash
+    self.to_data_hash
+  end
+
+  def to_data_hash
     {
       'level' => @level,
       'message' => @message,
@@ -283,7 +287,11 @@ class Puppet::Util::Log
       'time' => @time.iso8601(9),
       'file' => @file,
       'line' => @line,
-    }.to_pson
+    }
+  end
+
+  def to_pson(*args)
+    to_data_hash.to_pson(*args)
   end
 
   def message=(msg)

data/lib/puppet/util/log/destinations.rb

@@ -68,7 +68,7 @@ Puppet::Util::Log.newdesttype :file do
     # first make sure the directory exists
     # We can't just use 'Config.use' here, because they've
     # specified a "special" destination.
-    unless FileTest.exist?(File.dirname(path))
+    unless Puppet::FileSystem::File.exist?(File.dirname(path))
       FileUtils.mkdir_p(File.dirname(path), :mode => 0755)
       Puppet.info "Creating log directory #{File.dirname(path)}"
     end
@@ -95,6 +95,28 @@ Puppet::Util::Log.newdesttype :file do
   end
 end
 
+Puppet::Util::Log.newdesttype :logstash_event do
+  require 'time'
+
+  def format(msg)
+    # logstash_event format is documented at
+    # https://logstash.jira.com/browse/LOGSTASH-675
+
+    data = {}
+    data = msg.to_hash
+    data['version'] = 1
+    data['@timestamp'] = data['time']
+    data.delete('time')
+
+    data
+  end
+
+  def handle(msg)
+    message = format(msg)
+    $stdout.puts message.to_pson
+  end
+end
+
 Puppet::Util::Log.newdesttype :console do
   require 'puppet/util/colors'
   include Puppet::Util::Colors

data/lib/puppet/util/metric.rb

@@ -1,8 +1,10 @@
 # included so we can test object types
 require 'puppet'
+require 'puppet/network/format_support'
 
 # A class for handling metrics.  This is currently ridiculously hackish.
 class Puppet::Util::Metric
+  include Puppet::Network::FormatSupport
 
   attr_accessor :type, :name, :value, :label
   attr_writer :values
@@ -15,12 +17,16 @@ class Puppet::Util::Metric
     metric
   end
 
-  def to_pson
+  def to_data_hash
     {
       'name' => @name,
       'label' => @label,
       'values' => @values
-    }.to_pson
+    }
+  end
+
+  def to_pson(*args)
+    to_data_hash.to_pson(*args)
   end
 
   # Return a specific value
@@ -155,7 +161,7 @@ class Puppet::Util::Metric
       Puppet.warning "RRD library is missing; cannot store metrics"
       return
     end
-    self.create(time - 5) unless FileTest.exists?(self.path)
+    self.create(time - 5) unless Puppet::FileSystem::File.exist?(self.path)
 
     if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
       @rrd ||= RRDtool.new(self.path)

data/lib/puppet/util/monkey_patches.rb

@@ -105,6 +105,7 @@ class IO
   end
 
   def self.binread(name, length = nil, offset = 0)
+    Puppet.deprecation_warning("This is a monkey-patched implementation of IO.binread on ruby 1.8 and is deprecated. Read the file without this method as it will be removed in a future version.")
     File.open(name, 'rb') do |f|
       f.seek(offset) if offset > 0
       f.read(length)
@@ -194,8 +195,12 @@ if Puppet::Util::Platform.windows?
     def set_default_paths
       # This can be removed once openssl integrates with windows
       # cert store, see http://rt.openssl.org/Ticket/Display.html?id=2158
-      Puppet::Util::Windows::RootCerts.instance.each do |x509|
-        add_cert(x509)
+      Puppet::Util::Windows::RootCerts.instance.to_a.uniq.each do |x509|
+        begin
+          add_cert(x509)
+        rescue OpenSSL::X509::StoreError => e
+          warn "Failed to add #{x509.subject.to_s}"
+        end
       end
 
       __original_set_default_paths

data/lib/puppet/util/network_device/config.rb

@@ -15,7 +15,7 @@ class Puppet::Util::NetworkDevice::Config
   attr_reader :devices
 
   def exists?
-    FileTest.exists?(@file)
+    Puppet::FileSystem::File.exist?(@file)
   end
 
   def initialize

data/lib/puppet/util/plugins.rb

@@ -37,7 +37,7 @@ module Puppet
     def self.known
       Paths[Loaded.length...Paths.length].each { |path|
         file = File.join(path,'plugin_init.rb')
-        Loaded << (File.exist?(file) && new(file))
+        Loaded << (Puppet::FileSystem::File.exist?(file) && new(file))
       }
       Loaded.compact
     end

data/lib/puppet/util/profiler.rb

@@ -10,14 +10,19 @@ module Puppet::Util::Profiler
 
   NONE = Puppet::Util::Profiler::None.new
 
+  # Reset the profiling system to the original state
+  def self.clear
+    @profiler = nil
+  end
+
   # @return This thread's configured profiler
   def self.current
-    Thread.current[:profiler] || NONE
+    @profiler || NONE
   end
 
   # @param profiler [#profile] A profiler for the current thread
   def self.current=(profiler)
-    Thread.current[:profiler] = profiler
+    @profiler = profiler
   end
 
   # @param message [String] A description of the profiled event

data/lib/puppet/util/provider_features.rb

@@ -84,7 +84,7 @@ module Puppet::Util::ProviderFeatures
     names = @features.keys.sort { |a,b| a.to_s <=> b.to_s }
     names.each do |name|
       doc = @features[name].docs.gsub(/\n\s+/, " ")
-      str += "- *#{name}*: #{doc}\n"
+      str << "- *#{name}*: #{doc}\n"
     end
 
     if providers.length > 0
@@ -101,7 +101,7 @@ module Puppet::Util::ProviderFeatures
           end
         end
       end
-      str += doctable(headers, data)
+      str << doctable(headers, data)
     end
     str
   end