refactor load_env to apply_environment
This commit is contained in:
+1
-1
@@ -7,7 +7,7 @@ module Foreman
|
||||
# load contents of env_file into ENV
|
||||
def self.load_env!(env_file = './.env')
|
||||
require 'foreman/engine'
|
||||
Foreman::Engine.load_env(env_file)
|
||||
Foreman::Engine.load_env!(env_file)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -25,9 +25,9 @@ class Foreman::Engine
|
||||
@environment = read_environment_files(options[:env])
|
||||
end
|
||||
|
||||
def self.load_env(env_file)
|
||||
def self.load_env!(env_file)
|
||||
@environment = read_environment_files(env_file)
|
||||
load_env!
|
||||
apply_environment!
|
||||
end
|
||||
|
||||
def start
|
||||
@@ -77,7 +77,7 @@ private ######################################################################
|
||||
end
|
||||
|
||||
def fork_individual(process, num, port)
|
||||
load_env!
|
||||
apply_environment!
|
||||
|
||||
ENV["PORT"] = port.to_s
|
||||
ENV["PS"] = "#{process.name}.#{num}"
|
||||
@@ -205,7 +205,7 @@ private ######################################################################
|
||||
end
|
||||
end
|
||||
|
||||
def load_env!
|
||||
def apply_environment!
|
||||
@environment.each { |k,v| ENV[k] = v }
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user