refactor load_env to apply_environment

This commit is contained in:
Chris Continanza
2011-12-05 12:36:23 -08:00
parent 58e4cdafd7
commit 2e8030dbd4
2 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ module Foreman
# load contents of env_file into ENV # load contents of env_file into ENV
def self.load_env!(env_file = './.env') def self.load_env!(env_file = './.env')
require 'foreman/engine' require 'foreman/engine'
Foreman::Engine.load_env(env_file) Foreman::Engine.load_env!(env_file)
end end
end end
+4 -4
View File
@@ -25,9 +25,9 @@ class Foreman::Engine
@environment = read_environment_files(options[:env]) @environment = read_environment_files(options[:env])
end end
def self.load_env(env_file) def self.load_env!(env_file)
@environment = read_environment_files(env_file) @environment = read_environment_files(env_file)
load_env! apply_environment!
end end
def start def start
@@ -77,7 +77,7 @@ private ######################################################################
end end
def fork_individual(process, num, port) def fork_individual(process, num, port)
load_env! apply_environment!
ENV["PORT"] = port.to_s ENV["PORT"] = port.to_s
ENV["PS"] = "#{process.name}.#{num}" ENV["PS"] = "#{process.name}.#{num}"
@@ -205,7 +205,7 @@ private ######################################################################
end end
end end
def load_env! def apply_environment!
@environment.each { |k,v| ENV[k] = v } @environment.each { |k,v| ENV[k] = v }
end end
end end