Baguette
/
service
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ServiceDefinition#name based on filename and not specs.

master
Luka Vandervelden 2019-10-25 12:24:25 +02:00
parent bdeb23c275
commit a3c32905ee
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/service/service_definition.cr
View File

@ -47,10 +47,9 @@ class ServiceDefinition
getter checks : Array(Checks) getter checks : Array(Checks)
getter provides : Array(Provides) getter provides : Array(Provides)
def initialize(specs : SpecParser) def initialize(@name, specs : SpecParser)
sections = specs.sections sections = specs.sections
specs = specs.assignments specs = specs.assignments
@name = specs["name"].as_s
@command = specs["command"].as_s @command = specs["command"].as_s
@stop_command = specs["stop-command"]?.try &.as_s @stop_command = specs["stop-command"]?.try &.as_s
@directory = specs["directory"]?.try &.as_s @directory = specs["directory"]?.try &.as_s
@ -64,7 +63,10 @@ class ServiceDefinition
def self.load(path) def self.load(path)
Dir.each_child path do |child| Dir.each_child path do |child|
if child.match /\.spec$/ if child.match /\.spec$/
@@all << ServiceDefinition.new SpecParser.parse(File.read "#{path}/#{child}").not_nil! name = File.basename(child, ".spec")
specs = SpecParser.parse File.read "#{path}/#{child}"
@@all << ServiceDefinition.new name, specs
else else
next next
end end