Permalink
Browse files

0.1.7.12 Ensure environment-specific configs are only loaded once

  • Loading branch information...
1 parent 05a04be commit 4b9ea4519c25ec5ca177fb3c2ecdb3751bd632f2 @kennethkalmer committed Dec 4, 2009
Showing with 10 additions and 5 deletions.
  1. +4 −0 History.txt
  2. +2 −2 daemon-kit.gemspec
  3. +1 −1 lib/daemon_kit.rb
  4. +3 −2 lib/daemon_kit/initializer.rb
View
@@ -1,3 +1,7 @@
+== 0.1.7.12 2009-12-04
+
+* Bug fix, don't load environment files twice [grockit]
+
== 0.1.7.11 2009-11-30
* Renamed 'daemon_kit' executable to 'daemon-kit'
View
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = %q{daemon-kit}
- s.version = "0.1.7.11"
+ s.version = "0.1.7.12"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["kenneth.kalmer@gmail.com"]
- s.date = %q{2009-11-30}
+ s.date = %q{2009-12-04}
s.default_executable = %q{daemon-kit}
s.description = %q{daemon-kit aims to simplify creating Ruby daemons by providing a sound application skeleton (through a generator), task specific generators (jabber bot, etc) and robust environment management code.}
s.email = %q{kenneth.kalmer@gmail.com}
View
@@ -18,7 +18,7 @@
$:.include?( File.dirname(__FILE__).to_absolute_path )
module DaemonKit
- VERSION = '0.1.7.11'
+ VERSION = '0.1.7.12'
autoload :Initializer, 'daemon_kit/initializer'
autoload :Application, 'daemon_kit/application'
@@ -137,8 +137,9 @@ def load_patches
end
def load_environment
- return if @environment_loaded
- @environment_loaded = true
+ # Needs to be global to prevent loading the files twice
+ return if $_daemon_environment_loaded
+ $_daemon_environment_loaded = true
config = configuration

0 comments on commit 4b9ea45

Please sign in to comment.