lib/harbr/job.rb in harbr-0.1.34 vs lib/harbr/job.rb in harbr-0.1.35
- old
+ new
@@ -74,14 +74,14 @@
@port = port
end
def to_s
<<~SCRIPT
- #!/bin/sh
- exec 2>&1
- cd /var/harbr/containers/#{@container_name}/current
- exec ./exe/run #{@port} live
+ #!/bin/sh
+ exec 2>&1
+ cd /var/harbr/containers/#{@container_name}/current
+ exec ./exe/run #{@port} live
SCRIPT
end
def link
"ln -s /etc/sv/harbr/#{@container_name} /etc/service/#{@container_name}"
@@ -93,13 +93,13 @@
@port = port
end
def to_s
<<~SCRIPT
- #!/bin/sh
- sleep 3
- `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
+ #!/bin/sh
+ sleep 3
+ `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
SCRIPT
end
end
class Log
@@ -107,12 +107,12 @@
@container_name = container
end
def to_s
<<~SCRIPT
- #!/bin/sh
- exec svlogd -tt /var/log/harbr/#{@container_name}
+ #!/bin/sh
+ exec svlogd -tt /var/log/harbr/#{@container_name}
SCRIPT
end
end
end
@@ -126,13 +126,11 @@
manifest_data = YAML.load_file(manifest_path)
OpenStruct.new(manifest_data)
end
def perform(name, version)
-
- Harbr.notifiable(name,version) do
-
+ Harbr.notifiable(name, version) do
Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
manifest = load_manifest(name, version)
port = `port assign #{manifest.port}`.strip
system "sv stop #{name}" if File.exist?("/etc/service/#{name}")
if File.exist?("Gemfile")
@@ -157,10 +155,9 @@
containers = collate_containers(name, manifest.host, port)
create_traefik_config(containers)
puts "process #{version} of #{name}"
end
-
end
end
end
end