Moving all of the client and server code into a single network/ directory. In other words, more code structure cleanup.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2179 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 190 insertions, 0 deletions

diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb
new file mode 100644
index 000000000..604912025
--- /dev/null
+++ b/lib/puppet/network/client.rb
@@ -0,0 +1,190 @@
+# the available clients
+
+require 'puppet'
+require 'puppet/network/networkclient'
+
+# FIXME this still isn't a good design, because none of the handlers overlap
+# so i could just as easily include them all in the main module
+# but at least it's better organized for now
+class Puppet::Network::Client
+    include Puppet::Daemon
+    include Puppet::Util
+
+    # FIXME The cert stuff should only come up with networking, so it
+    # should be in the network client, not the normal client.  But if i do
+    # that, it's hard to tell whether the certs have been initialized.
+    include Puppet::Daemon
+    attr_reader :secureinit
+    attr_accessor :schedule, :lastrun, :local, :stopping
+
+    class << self
+        attr_reader :drivername, :handler
+        attr_accessor :netclient
+    end
+
+    def initcerts
+        unless self.readcert
+            #if self.is_a? Puppet::Network::Client::CA
+                unless self.requestcert
+                    return nil
+                end
+            #else
+            #    return nil
+            #end
+            #unless self.requestcert
+            #end
+        end
+
+        # unless we have a driver, we're a local client and we can't add
+        # certs anyway, so it doesn't matter
+        unless @driver
+            return true
+        end
+
+        self.setcerts
+    end
+
+    def initialize(hash)
+        # to whom do we connect?
+        @server = nil
+        @nil = nil
+        @secureinit = hash[:NoSecureInit] || true
+
+        if hash.include?(:FQDN)
+            @fqdn = hash[:FQDN]
+        else
+            self.fqdn
+        end
+
+        if hash.include?(:Cache)
+            @cache = hash[:Cache]
+        else
+            @cache = true
+        end
+
+        driverparam = self.class.drivername
+        if hash.include?(:Server)
+            if $noclientnetworking
+                raise NetworkClientError.new("Networking not available: %s" %
+                    $nonetworking)
+            end
+
+            args = {:Server => hash[:Server]}
+            args[:Port] = hash[:Port] || Puppet[:masterport]
+
+            if self.readcert
+                args[:Certificate] = @cert
+                args[:Key] = @key
+                args[:CAFile] = @cacertfile
+            end
+
+            netclient = nil
+            unless netclient = self.class.netclient
+                unless handler = self.class.handler
+                    raise Puppet::DevError,
+                        "Class %s has no handler defined" % self.class
+                end
+                namespace = self.class.handler.interface.prefix
+                netclient = Puppet::Network::NetworkClient.netclient(namespace)
+                self.class.netclient = netclient
+            end
+            @driver = netclient.new(args)
+            @local = false
+        elsif hash.include?(driverparam)
+            @driver = hash[driverparam]
+            @local = true
+        else
+            raise ClientError, "%s must be passed a Server or %s" %
+                [self.class, driverparam]
+        end
+    end
+
+    # Are we a local client?
+    def local?
+        if defined? @local and @local
+            true
+        else
+            false
+        end
+    end
+
+    # A wrapper method to run and then store the last run time
+    def runnow
+        if self.stopping
+            Puppet.notice "In shutdown progress; skipping run"
+            return
+        end
+        begin
+            self.run
+            self.lastrun = Time.now.to_i
+        rescue => detail
+            if Puppet[:trace]
+                puts detail.backtrace
+            end
+            Puppet.err "Could not run %s: %s" % [self.class, detail]
+        end
+    end
+
+    def run
+        raise Puppet::DevError, "Client type %s did not override run" %
+            self.class
+    end
+
+    def scheduled?
+        if sched = self.schedule
+            return sched.match?(self.lastrun)
+        else
+            return true
+        end
+    end
+
+    def setcerts
+        @driver.cert = @cert
+        @driver.key = @key
+        @driver.ca_file = @cacertfile
+    end
+
+    def shutdown
+        if self.stopping
+            Puppet.notice "Already in shutdown"
+        else
+            self.stopping = true
+            if self.respond_to? :running? and self.running?
+                Puppet::Util::Storage.store
+            end
+            rmpidfile()
+        end
+    end
+
+    # Start listening for events.  We're pretty much just listening for
+    # timer events here.
+    def start
+        setpidfile()
+        # Create our timer.  Puppet will handle observing it and such.
+        timer = Puppet.newtimer(
+            :interval => Puppet[:runinterval],
+            :tolerance => 1,
+            :start? => true
+        ) do
+            if self.scheduled?
+                self.runnow
+            end
+        end
+
+        # Run once before we start following the timer
+        self.runnow
+    end
+
+    require 'puppet/network/client/proxy'
+    require 'puppet/network/client/ca'
+    require 'puppet/network/client/dipper'
+    require 'puppet/network/client/file'
+    require 'puppet/network/client/log'
+    require 'puppet/network/client/master'
+    require 'puppet/network/client/runner'
+    require 'puppet/network/client/status'
+    require 'puppet/network/client/reporter'
+    require 'puppet/network/client/resource'
+end
+
+# $Id$