adding file reread to master, although it is plenty hackish

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

3 files changed, 91 insertions, 3 deletions

diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index f7a15e6b9..d25185476 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -184,6 +184,7 @@ class Server
             if @configstamp and FileTest.exists?(@config)
                 if @configtimeout and @configstatted and
                     (Time.now - @configstatted > @configtimeout)
+                        @configstatted = Time.now
                         tmp = File.stat(@config).ctime
 
                         if tmp == @configstamp
diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb
index b45f91210..dd16c788d 100644
--- a/lib/puppet/server/master.rb
+++ b/lib/puppet/server/master.rb
@@ -20,11 +20,12 @@ class Server
             # FIXME this should all be s/:File/:Manifest/g or something
             # build our AST
             @file = hash[:File] || Puppet[:manifest]
-            @parser = Puppet::Parser::Parser.new()
-            @parser.file = @file
-            @ast = @parser.parse
             hash.delete(:File)
 
+            @filestamp = nil
+            @filetimeout = hash[:FileTimeout] || 60
+            parsefile
+
             if hash[:Local]
                 @local = hash[:Local]
             else
@@ -39,6 +40,7 @@ class Server
         end
 
         def getconfig(facts, client = nil, clientip = nil)
+            parsefile
             if client
                 #Puppet.warning request.inspect
             end
@@ -84,6 +86,39 @@ class Server
                 return CGI.escape(Marshal::dump(retobjects))
             end
         end
+
+        private
+
+        def parsefile
+            if @filestamp and FileTest.exists?(@file)
+                if @filetimeout and @filestatted and
+                    (Time.now - @filestatted > @filetimeout)
+                        tmp = File.stat(@file).ctime
+
+                        @filestatted = Time.now
+                        if tmp == @filestamp
+                            return
+                        else
+                            Puppet.notice "Reloading file"
+                        end
+                end
+            end
+
+            unless FileTest.exists?(@file)
+                if @ast
+                    Puppet.warning "Manifest %s has disappeared" % @file
+                    return
+                else
+                    raise Puppet::Error, "Manifest %s must exist" % @file
+                end
+            end
+            # should i be creating a new parser each time...?
+            @parser = Puppet::Parser::Parser.new()
+            @parser.file = @file
+            @ast = @parser.parse
+
+            @filestamp = File.stat(@file).ctime
+        end
     end
 end
 end
diff --git a/test/server/tc_master.rb b/test/server/tc_master.rb
index 9a5f2fdbb..90fd3b3c0 100644
--- a/test/server/tc_master.rb
+++ b/test/server/tc_master.rb
@@ -117,6 +117,58 @@ class TestMaster < Test::Unit::TestCase
             break
         }
     end
+
+    def test_zfilereread
+        Puppet[:debug] = true if __FILE__ == $0
+        Puppet[:puppetconf] = "/tmp/masterfilereread"
+        Puppet[:puppetvar] = "/tmp/masterfilereread"
+        @@tmpfiles << Puppet[:puppetconf]
+
+        manifest = "/tmp/masterfilerereadmanifest.pp"
+        @@tmpfiles << manifest = "/tmp/masterfilerereadmanifest.pp"
+        file1 = "/tmp/masterfilecreationrearead"
+        file2 = "/tmp/masterfilecreationrearead2"
+        @@tmpfiles << file1
+        @@tmpfiles << file2
+
+        File.open(manifest, "w") { |f|
+            f.puts %{file { "/tmp/masterfilecreationrearead": create => true } }
+        }
+        client = master = nil
+        assert_nothing_raised() {
+            # this is the default server setup
+            master = Puppet::Server::Master.new(
+                :File => manifest,
+                :Local => true,
+                :FileTimeout => 0.5
+            )
+        }
+        assert_nothing_raised() {
+            client = Puppet::Client::MasterClient.new(
+                :Master => master
+            )
+        }
+
+        assert_nothing_raised {
+            client.getconfig
+            client.apply
+        }
+
+        assert(FileTest.exists?(file1), "First file %s does not exist" % file1)
+        sleep 1
+        Puppet::Type.allclear
+
+        File.open(manifest, "w") { |f|
+            f.puts %{file { "/tmp/masterfilecreationrearead2": create => true } }
+        }
+        assert_nothing_raised {
+            client.getconfig
+            client.apply
+        }
+
+        assert(FileTest.exists?(file2), "Second file %s does not exist" % file2)
+    end
+
 end
 
 # $Id$