diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-03 19:45:52 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-03 19:45:52 +0000 |
| commit | 9115fefb1a615e3d918c3eaa266135a651be17eb (patch) | |
| tree | 4dfab37eba2d041fdf4f96d64cd21112c4544217 /lib/puppet/parser/interpreter.rb | |
| parent | 0ef89715c590137299e89496bf6ee09d97a8b2b2 (diff) | |
| download | puppet-9115fefb1a615e3d918c3eaa266135a651be17eb.tar.gz puppet-9115fefb1a615e3d918c3eaa266135a651be17eb.tar.xz puppet-9115fefb1a615e3d918c3eaa266135a651be17eb.zip | |
Adding extra connection statements and enabling concurrency support in rails, hopefully fixing #399.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2027 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index ad2487f11..a00b10042 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -778,7 +778,9 @@ class Puppet::Parser::Interpreter "storeconfigs is enabled but rails is unavailable" end - Puppet::Rails.init + unless ActiveRecord::Base.connected? + Puppet::Rails.init + end # Fork the storage, since we don't need the client waiting # on that. How do I avoid this duplication? |