refactor engine to expose env methods
This commit is contained in:
1 parent
39ace26ae1
commit
79cf541ebe
1 file changed
+16
-2
+16
-2
@@ -12,7 +12,6 @@ class Foreman::Engine
|
|||||||
|
|
||||||
attr_reader :procfile
|
attr_reader :procfile
|
||||||
attr_reader :directory
|
attr_reader :directory
|
||||||
attr_reader :environment
|
|
||||||
attr_reader :options
|
attr_reader :options
|
||||||
|
|
||||||
extend Term::ANSIColor
|
extend Term::ANSIColor
|
||||||
@@ -26,6 +25,11 @@ class Foreman::Engine
|
|||||||
@environment = read_environment_files(options[:env])
|
@environment = read_environment_files(options[:env])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.load_env(env_file)
|
||||||
|
@environment = read_environment_files(env_file)
|
||||||
|
load_env!
|
||||||
|
end
|
||||||
|
|
||||||
def start
|
def start
|
||||||
proctitle "ruby: foreman master"
|
proctitle "ruby: foreman master"
|
||||||
termtitle "#{File.basename(@directory)} - foreman (#{processes.size} processes)"
|
termtitle "#{File.basename(@directory)} - foreman (#{processes.size} processes)"
|
||||||
@@ -73,7 +77,7 @@ private ######################################################################
|
|||||||
end
|
end
|
||||||
|
|
||||||
def fork_individual(process, num, port)
|
def fork_individual(process, num, port)
|
||||||
@environment.each { |k,v| ENV[k] = v }
|
load_env!
|
||||||
|
|
||||||
ENV["PORT"] = port.to_s
|
ENV["PORT"] = port.to_s
|
||||||
ENV["PS"] = "#{process.name}.#{num}"
|
ENV["PS"] = "#{process.name}.#{num}"
|
||||||
@@ -175,6 +179,9 @@ private ######################################################################
|
|||||||
@current_color >= COLORS.length ? "" : COLORS[@current_color]
|
@current_color >= COLORS.length ? "" : COLORS[@current_color]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
module Env
|
||||||
|
attr_reader :environment
|
||||||
|
|
||||||
def read_environment_files(filenames)
|
def read_environment_files(filenames)
|
||||||
environment = {}
|
environment = {}
|
||||||
|
|
||||||
@@ -198,4 +205,11 @@ private ######################################################################
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def load_env!
|
||||||
|
@environment.each { |k,v| ENV[k] = v }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
include Env
|
||||||
|
extend Env
|
||||||
end
|
end
|
||||||
Reference in new issue
Block a user