puppet 0.16.0 → 0.18.4

data/lib/puppet/daemon.rb

@@ -6,8 +6,13 @@ module Puppet
     # A module that handles operations common to all daemons.  This is included
     # into the Server and Client base classes.
     module Daemon
+        include Puppet::Util
+
+        Puppet.config.setdefaults(:puppet, :setpidfile => [true,
+            "Whether to store a PID file for the daemon."])
         def daemonname
-            $0.sub(/.+#{File::SEPARATOR}/,'')
+            #$0.sub(/.+#{File::SEPARATOR}/,'')
+            Puppet.name
         end
 
         # The path to the pid file for this server
@@ -22,8 +27,6 @@ module Puppet
                 exit(0)
             end
 
-            setpidfile()
-
             # Get rid of console logging
             Puppet::Log.close(:console)
 
@@ -36,9 +39,9 @@ module Puppet
                 Puppet::Log.reopen
             rescue => detail
                 File.open("/tmp/daemonout", "w") { |f|
-                    f.puts "Could not start %s: %s" % [$0, detail]
+                    f.puts "Could not start %s: %s" % [Puppet.name, detail]
                 }
-                Puppet.err "Could not start %s: %s" % [$0, detail]
+                Puppet.err "Could not start %s: %s" % [Puppet.name, detail]
                 exit(12)
             end
         end
@@ -89,6 +92,10 @@ module Puppet
                 return true
             end
 
+            unless defined? @fqdn
+                self.fqdn
+            end
+
             # we are not going to encrypt our key, but we need at a minimum
             # a keyfile and a certfile
             @certfile = File.join(Puppet[:certdir], [@fqdn, "pem"].join("."))
@@ -120,6 +127,10 @@ module Puppet
         # of creating the cert request, contacting the remote system, and
         # storing the cert locally.
         def requestcert
+            unless @secureinit
+                raise Puppet::DevError,
+                    "Tried to request cert without initialized security"
+            end
             retrieved = false
             Puppet.config.use(:puppet, :certificates)
             # create the directories involved
@@ -193,53 +204,64 @@ module Puppet
             return retrieved
         end
 
-        # Create the pid file.
-        def setpidfile
-            Puppet.config.use(:puppet)
-            @pidfile = self.pidfile
-            if FileTest.exists?(@pidfile)
-                Puppet.info "Deleting old pid file"
-                begin
-                    File.unlink(@pidfile)
-                rescue Errno::EACCES
-                    Puppet.err "Could not delete old PID file; cannot create new one"
-                    return
+        # Remove the pid file
+        def rmpidfile
+            threadlock(:pidfile) do
+                if defined? @pidfile and @pidfile and FileTest.exists?(@pidfile)
+                    begin
+                        File.unlink(@pidfile)
+                    rescue => detail
+                        Puppet.err "Could not remove PID file %s: %s" %
+                            [@pidfile, detail]
+                    end
                 end
             end
+        end
 
-            #unless FileTest.exists?(Puppet[:rundir])
-            #    Puppet.recmkdir(Puppet[:rundir])
-            #    File.chmod(01777, Puppet[:rundir])
-            #end
+        # Create the pid file.
+        def setpidfile
+            return unless Puppet[:setpidfile]
+            threadlock(:pidfile) do
+                Puppet.config.use(:puppet)
+                @pidfile = self.pidfile
+                if FileTest.exists?(@pidfile)
+                    if defined? $setpidfile
+                        return
+                    else
+                        raise Puppet::Error, "A PID file already exists for #{Puppet.name}
+    at #{@pidfile}.  Not starting."
+                    end
+                end
 
-            Puppet.info "Setting pidfile to %s" % @pidfile
-            begin
-                File.open(@pidfile, "w") { |f| f.puts $$ }
-            rescue => detail
-                Puppet.err "Could not create PID file: %s" % detail
-                exit(74)
+                Puppet.info "Creating PID file to %s" % @pidfile
+                begin
+                    File.open(@pidfile, "w") { |f| f.puts $$ }
+                rescue => detail
+                    Puppet.err "Could not create PID file: %s" % detail
+                    exit(74)
+                end
+                $setpidfile = true
             end
-            Puppet.info "pid file is %s" % @pidfile
         end
 
         # Shut down our server
         def shutdown
             # Remove our pid file
-            if defined? @pidfile and @pidfile and FileTest.exists?(@pidfile)
-                begin
-                    File.unlink(@pidfile)
-                rescue => detail
-                    Puppet.err "Could not remove PID file %s: %s" %
-                        [@pidfile, detail]
-                end
+            rmpidfile()
+
+            # And close all logs except the console.
+            Puppet::Log.destinations.reject { |d| d == :console }.each do |dest|
+                Puppet::Log.close(dest)
             end
 
-            # And close all logs
-            Puppet::Log.close
+            super
+        end
 
+        def start
+            setpidfile()
             super
         end
     end
 end
 
-# $Id: daemon.rb 965 2006-03-02 07:30:14Z luke $
+# $Id: daemon.rb 1315 2006-06-27 05:15:51Z luke $

data/lib/puppet/element.rb

@@ -6,6 +6,7 @@ require 'puppet'
 # and provides a few simple across-the-board functions like 'noop'
 class Puppet::Element
     include Puppet
+    include Puppet::Util
     attr_writer :noop
 
     class << self
@@ -66,4 +67,4 @@ class Puppet::Element
 
 end
 
-# $Id: element.rb 980 2006-03-03 23:06:40Z luke $
+# $Id: element.rb 1227 2006-05-28 22:13:46Z luke $

data/lib/puppet/event.rb

@@ -75,6 +75,17 @@ module Puppet
                 @subscriptions[stype][sname] << sub
             end
 
+            # Collect all of the subscriptions that target a specific event.
+            def self.targets_of(event, source)
+                type, name = self.split(source)
+
+                @subscriptions[type][name].each { |sub|
+                    if sub.match?(event)
+                        yield sub
+                    end
+                }
+            end
+
             # Trigger the subscriptions related to an event, and then pass it up
             # as appropriate
             def self.trigger(source, event)
@@ -195,7 +206,7 @@ module Puppet
             end
 
             # Trigger a subscription, which basically calls the associated method
-            # on the target object.
+            # on the target object. XXX This is currently unused.
             def trigger(transaction)
                 event = nil
 
@@ -245,9 +256,9 @@ module Puppet
 		end
 
         def to_s
-            self.event.to_s
+            @source.to_s + " -> " + self.event.to_s
         end
 	end
 end
 
-# $Id: event.rb 998 2006-03-09 20:46:55Z luke $
+# $Id: event.rb 1178 2006-05-05 19:43:23Z luke $

data/lib/puppet/filetype.rb

@@ -112,43 +112,38 @@ module Puppet
 
         # Operate on plain files.
         newfiletype(:ram) do
+            @@tabs = {}
+
+            def self.clear
+                @@tabs.clear
+            end
+
             def initialize(path)
                 super
-                @text = ""
+                @@tabs[@path] ||= ""
             end
 
             # Read the file.
             def read
                 Puppet.info "Reading %s from RAM" % @path
-                @text
+                @@tabs[@path]
             end
 
             # Remove the file.
             def remove
                 Puppet.info "Removing %s from RAM" % @path
-                @text = ""
+                @@tabs[@path] = ""
             end
 
             # Overwrite the file.
             def write(text)
                 Puppet.info "Writing %s to RAM" % @path
-                @text = text
+                @@tabs[@path] = text
             end
         end
 
         # Handle Linux-style cron tabs.
         newfiletype(:crontab) do
-            # Only add the -u flag when the @path is different.  Fedora apparently
-            # does not think I should be allowed to set the @path to my
-            def cmdbase
-                cmd = nil
-                if @path == Process.uid
-                    return "crontab"
-                else
-                    return "crontab -u #{@path}"
-                end
-            end
-
             def initialize(user)
                 begin
                     uid = Puppet::Util.uid(user)
@@ -178,6 +173,19 @@ module Puppet
                     p.print text
                 }
             end
+
+            private
+
+            # Only add the -u flag when the @path is different.  Fedora apparently
+            # does not think I should be allowed to set the @path to my
+            def cmdbase
+                cmd = nil
+                if @path == Process.uid
+                    return "crontab"
+                else
+                    return "crontab -u #{@path}"
+                end
+            end
         end
 
         # SunOS has completely different cron commands; this class implements
@@ -208,7 +216,8 @@ module Puppet
             end
         end
 
-        # Treat netinfo tables as a single file, just for simplicity of certain types
+        # Treat netinfo tables as a single file, just for simplicity of certain
+        # types
         newfiletype(:netinfo) do
             class << self
                 attr_accessor :format
@@ -230,8 +239,8 @@ module Puppet
                 end
             end
 
-            # Convert our table to an array of hashes.  This only works for handling one
-            # table at a time.
+            # Convert our table to an array of hashes.  This only works for
+            # handling one table at a time.
             def to_array(text = nil)
                 unless text
                     text = read
@@ -296,4 +305,4 @@ module Puppet
     end
 end
 
-# $Id: filetype.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: filetype.rb 1402 2006-07-18 15:35:15Z luke $

data/lib/puppet/log.rb

@@ -16,21 +16,83 @@ module Puppet
         @levels = [:debug,:info,:notice,:warning,:err,:alert,:emerg,:crit]
         @loglevel = 2
 
-		@colors = {
-			:debug => SLATE,
-			:info => GREEN,
-			:notice => PINK,
-			:warning => ORANGE,
-			:err => YELLOW,
-            :alert => BLUE,
-            :emerg => RESET,
-            :crit => RESET
-		}
-
-        #@destinations = {:syslog => Syslog.open("puppet")}
-        #@destinations = {:console => :console}
+        @desttypes = {}
+
+        # A type of log destination.
+        class Destination
+            class << self
+                attr_accessor :name
+            end
+
+            # Mark the things we're supposed to match.
+            def self.match(obj)
+                @matches ||= []
+                @matches << obj
+            end
+
+            # See whether we match a given thing.
+            def self.match?(obj)
+                # Convert single-word strings into symbols like :console and :syslog
+                if obj.is_a? String and obj =~ /^\w+$/
+                    obj = obj.downcase.intern
+                end
+
+                @matches.each do |thing|
+                    # Search for direct matches or class matches
+                    return true if thing === obj or thing == obj.class.to_s
+                end
+                return false
+            end
+
+            def name
+                if defined? @name
+                    return @name
+                else
+                    return self.class.name
+                end
+            end
+
+            # Set how to handle a message.
+            def self.sethandler(&block)
+                define_method(:handle, &block)
+            end
+
+            # Mark how to initialize our object.
+            def self.setinit(&block)
+                define_method(:initialize, &block)
+            end
+        end
+
+        # Create a new destination type.
+        def self.newdesttype(name, options = {}, &block)
+            dest = Class.new(Destination)
+            name = name.to_s.downcase.intern
+            dest.name = name
+            dest.match(dest.name)
+
+            const_set("Dest" + name.to_s.capitalize, dest)
+
+            @desttypes[dest.name] = dest
+
+            options.each do |option, value|
+                begin
+                    dest.send(option.to_s + "=", value)
+                rescue NoMethodError
+                    raise "%s is an invalid option for log destinations" % option
+                end
+            end
+
+            dest.class_eval(&block)
+
+            return dest
+        end
+
         @destinations = {}
 
+        class << self
+            include Puppet::Util
+        end
+
         # Reset all logs to basics.  Basically just closes all files and undefs
         # all of the other objects.
         def Log.close(dest = nil)
@@ -42,7 +104,7 @@ module Puppet
                     @destinations.delete(dest)
                 end
             else
-                @destinations.each { |type, dest|
+                @destinations.each { |name, dest|
                     if dest.respond_to?(:flush)
                         dest.flush
                     end
@@ -52,8 +114,6 @@ module Puppet
                 }
                 @destinations = {}
             end
-
-            Puppet.info "closed"
         end
 
         # Flush any log destinations that support such operations.
@@ -112,63 +172,220 @@ module Puppet
             @levels.dup
         end
 
-        # Create a new log destination.
-        def Log.newdestination(dest)
-            # Each destination can only occur once.
-            if @destinations.include?(dest)
-                return
+        newdesttype :syslog do
+            def close
+                Syslog.close
             end
 
-            case dest
-            when "syslog", :syslog
+            def initialize
                 if Syslog.opened?
                     Syslog.close
                 end
                 name = Puppet.name
                 name = "puppet-#{name}" unless name =~ /puppet/
-                @destinations[:syslog] = Syslog.open(name)
-            when /^\// # files
-                Puppet.info "opening %s as a log" % dest
+
+                options = Syslog::LOG_PID | Syslog::LOG_NDELAY
+
+                # XXX This should really be configurable.
+                facility = Syslog::LOG_DAEMON
+
+                @syslog = Syslog.open(name, options, facility)
+            end
+
+            def handle(msg)
+                # XXX Syslog currently has a bug that makes it so you
+                # cannot log a message with a '%' in it.  So, we get rid
+                # of them.
+                if msg.source == "Puppet"
+                    @syslog.send(msg.level, msg.to_s.gsub("%", '%%'))
+                else
+                    @syslog.send(msg.level, "(%s) %s" %
+                        [msg.source.to_s.gsub("%", ""),
+                            msg.to_s.gsub("%", '%%')
+                        ]
+                    )
+                end
+            end
+        end
+
+        newdesttype :file do
+            match(/^\//)
+
+            def close
+                if defined? @file
+                    @file.close
+                    @file = nil
+                end
+            end
+
+            def flush
+                if defined? @file
+                    @file.flush
+                end
+            end
+
+            def initialize(path)
+                @name = path
                 # 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(dest))
+                unless FileTest.exist?(File.dirname(path))
+                    Puppet.recmkdir(File.dirname(path))
+                    Puppet.info "Creating log directory %s" % File.dirname(path)
+                end
+
+                # create the log file, if it doesn't already exist
+                file = File.open(path, File::WRONLY|File::CREAT|File::APPEND)
+
+                @file = file
+            end
+
+            def handle(msg)
+                @file.puts("%s %s (%s): %s" %
+                    [msg.time, msg.source, msg.level, msg.to_s])
+            end
+        end
+
+        newdesttype :console do
+            @@colors = {
+                :debug => SLATE,
+                :info => GREEN,
+                :notice => PINK,
+                :warning => ORANGE,
+                :err => YELLOW,
+                :alert => BLUE,
+                :emerg => RESET,
+                :crit => RESET
+            }
+
+            def initialize
+                # Flush output immediately.
+                $stdout.sync = true
+            end
+
+            def handle(msg)
+                color = ""
+                reset = ""
+                if Puppet[:color]
+                    color = @@colors[msg.level]
+                    reset = RESET
+                end
+                if msg.source == "Puppet"
+                    puts color + "%s: %s" % [
+                        msg.level, msg.to_s
+                    ] + reset
+                else
+                    puts color + "%s: %s: %s" % [
+                        msg.level, msg.source, msg.to_s
+                    ] + reset
+                end
+            end
+        end
+
+        newdesttype :host do
+            def initialize(host)
+                Puppet.info "Treating %s as a hostname" % host
+                args = {}
+                if host =~ /:(\d+)/
+                    args[:Port] = $1
+                    args[:Server] = host.sub(/:\d+/, '')
+                else
+                    args[:Server] = host
+                end
+
+                @name = host
+
+                @driver = Puppet::Client::LogClient.new(args)
+            end
+
+            def handle(msg)
+                unless msg.is_a?(String) or msg.remote
+                    unless defined? @hostname
+                        @hostname = Facter["hostname"].value
+                    end
+                    unless defined? @domain
+                        @domain = Facter["domain"].value
+                        if @domain
+                            @hostname += "." + @domain
+                        end
+                    end
+                    if msg.source =~ /^\//
+                        msg.source = @hostname + ":" + msg.source
+                    elsif msg.source == "Puppet"
+                        msg.source = @hostname + " " + msg.source
+                    else
+                        msg.source = @hostname + " " + msg.source
+                    end
                     begin
-                        Puppet.recmkdir(File.dirname(dest))
-                        Puppet.info "Creating log directory %s" %
-                            File.dirname(dest)
+                        #puts "would have sent %s" % msg
+                        #puts "would have sent %s" %
+                        #    CGI.escape(YAML.dump(msg))
+                        begin
+                            tmp = CGI.escape(YAML.dump(msg))
+                        rescue => detail
+                            puts "Could not dump: %s" % detail.to_s
+                            return
+                        end
+                        # Add the hostname to the source
+                        @driver.addlog(tmp)
                     rescue => detail
-                        Log.destination = :console
-                        Puppet.err "Could not create log directory: %s" %
-                            detail
-                        return
+                        if Puppet[:debug]
+                            puts detail.backtrace
+                        end
+                        Puppet.err detail
+                        Puppet::Log.close(self)
                     end
                 end
+            end
+        end
 
-                begin
-                    # create the log file, if it doesn't already exist
-                    file = File.open(dest,File::WRONLY|File::CREAT|File::APPEND)
-                rescue => detail
-                    Log.destination = :console
-                    Puppet.err "Could not create log file: %s" %
-                        detail
-                    return
+        # Log to a transaction report.
+        newdesttype :report do
+            match "Puppet::Transaction::Report"
+
+            def initialize(report)
+                @report = report
+            end
+
+            def handle(msg)
+                # Only add messages from objects, since anything else is
+                # probably unrelated to this run.
+                if msg.objectsource?
+                    @report.newlog(msg)
                 end
-                @destinations[dest] = file
-            when "console", :console
-                @destinations[:console] = :console
-            when Puppet::Server::Logger
-                @destinations[dest] = dest
-            else
-                Puppet.info "Treating %s as a hostname" % dest
-                args = {}
-                if dest =~ /:(\d+)/
-                    args[:Port] = $1
-                    args[:Server] = dest.sub(/:\d+/, '')
+            end
+        end
+
+        # Create a new log destination.
+        def Log.newdestination(dest)
+            # Each destination can only occur once.
+            if @destinations.find { |name, obj| obj.name == dest }
+                return
+            end
+
+            name, type = @desttypes.find do |name, klass|
+                klass.match?(dest)
+            end
+
+            unless type
+                raise Puppet::DevError, "Unknown destination type %s" % dest
+            end
+
+            begin
+                if type.instance_method(:initialize).arity == 1
+                    @destinations[dest] = type.new(dest)
                 else
-                    args[:Server] = dest
+                    @destinations[dest] = type.new()
+                end
+            rescue => detail
+                if Puppet[:debug]
+                    puts detail.backtrace
+                end
+
+                # If this was our only destination, then add the console back in.
+                if @destinations.empty? and (dest != :console and dest != "console")
+                    newdestination(:console)
                 end
-                @destinations[dest] = Puppet::Client::LogClient.new(args)
             end
         end
 
@@ -181,83 +398,12 @@ module Puppet
             if @levels.index(msg.level) < @loglevel 
                 return
             end
-            @destinations.each { |type, dest|
-                case dest
-                when Module # This is the Syslog module
-                    next if msg.remote
-                    # XXX Syslog currently has a bug that makes it so you
-                    # cannot log a message with a '%' in it.  So, we get rid
-                    # of them.
-                    if msg.source == "Puppet"
-                        dest.send(msg.level, msg.to_s.gsub("%", '%%'))
-                    else
-                        dest.send(msg.level, "(%s) %s" %
-                            [msg.source.to_s.gsub("%", ""),
-                                msg.to_s.gsub("%", '%%')
-                            ]
-                        )
-                    end
-                when File:
-                    dest.puts("%s %s (%s): %s" %
-                        [msg.time, msg.source, msg.level, msg.to_s])
-                when :console
-                    color = ""
-                    reset = ""
-                    if Puppet[:color]
-                        color = @colors[msg.level]
-                        reset = RESET
-                    end
-                    if msg.source == "Puppet"
-                        puts color + "%s: %s" % [
-                            msg.level, msg.to_s
-                        ] + reset
-                    else
-                        puts color + "%s: %s: %s" % [
-                            msg.level, msg.source, msg.to_s
-                        ] + reset
-                    end
-                when Puppet::Client::LogClient
-                    unless msg.is_a?(String) or msg.remote
-                        unless defined? @hostname
-                            @hostname = Facter["hostname"].value
-                        end
-                        unless defined? @domain
-                            @domain = Facter["domain"].value
-                            if @domain
-                                @hostname += "." + @domain
-                            end
-                        end
-                        if msg.source =~ /^\//
-                            msg.source = @hostname + ":" + msg.source
-                        elsif msg.source == "Puppet"
-                            msg.source = @hostname + " " + msg.source
-                        else
-                            msg.source = @hostname + " " + msg.source
-                        end
-                        begin
-                            #puts "would have sent %s" % msg
-                            #puts "would have sent %s" %
-                            #    CGI.escape(YAML.dump(msg))
-                            begin
-                                tmp = CGI.escape(YAML.dump(msg))
-                            rescue => detail
-                                puts "Could not dump: %s" % detail.to_s
-                                return
-                            end
-                            # Add the hostname to the source
-                            dest.addlog(tmp)
-                            #dest.addlog(msg.to_s)
-                            sleep(0.5)
-                        rescue => detail
-                            Puppet.err detail
-                            @destinations.delete(type)
-                        end
-                    end
-                else
-                    raise Puppet::Error, "Invalid log destination %s" % dest
-                    #puts "Invalid log destination %s" % dest.inspect
+
+            @destinations.each do |name, dest|
+                threadlock(dest) do
+                    dest.handle(msg)
                 end
-            }
+            end
         end
 
         def Log.sendlevel?(level)
@@ -332,6 +478,15 @@ module Puppet
             Log.newmessage(self)
 		end
 
+        # Was the source of this log an object?
+        def objectsource?
+            if defined? @objectsource and @objectsource
+                @objectsource
+            else
+                false
+            end
+        end
+
         # If they pass a source in to us, we make sure it is a string, and
         # we retrieve any tags we can.
         def source=(source)
@@ -339,8 +494,10 @@ module Puppet
             # is a bit of a stupid hack, specifically testing for elements, but
             # eh.
             if source.is_a?(Puppet::Element) and source.respond_to?(:path)
+                @objectsource = true
                 @source = source.path
             else
+                @objectsource = false
                 @source = source.to_s
             end
             unless defined? @tags and @tags
@@ -350,10 +507,18 @@ module Puppet
             end
         end
 
+        def tagged?(tag)
+            @tags.include?(tag)
+        end
+
+		def to_report
+            "%s %s (%s): %s" % [self.time, self.source, self.level, self.to_s]
+		end
+
 		def to_s
             return @message
 		end
 	end
 end
 
-# $Id: log.rb 1124 2006-04-20 07:00:10Z luke $
+# $Id: log.rb 1422 2006-07-22 03:32:56Z luke $