harbr 0.0.69 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1848f4996f4de495baab3cb495d5322268fa2b241a6b730398a3eccdfdcbb14e
-  data.tar.gz: fbea4944a710247e6bfbda103954b362fa5e263916cd59bed9f78e1f0b7d743d
+  metadata.gz: 78ae00a2ad38fc4706cf9587913490f8dd830474371bcf6a70a679d3c4d9ed73
+  data.tar.gz: ecda50fd182e1f485c601a855ef294fef77a31091a1e74680bc28a3f24ffea23
 SHA512:
-  metadata.gz: 9ab00982214a62f82d3d7d718aec943db7b5c5056f0ee76f14c8b7c5abc51818492a83bf135b2017044591cf92e6f13984ca20c7250effbd67b309e52dbfafcc
-  data.tar.gz: 971444bd9f9f62e2f370a2df122c800df01841182780a55d8e44cc73f4203fffb7c25c1777296fac1bcbc8b65631dab3a56df0091e2811a30c7b3f4dd812534f
+  metadata.gz: 21c963f4516ec87c577f3300c5c7d6911b5524ba19d3faf83a0e5208f5e2b720213cff513c03db3082af55ddf12cbf4bbfd5f8b61d412ad6895b0cb968f3fd7f
+  data.tar.gz: cc459e1ad581af6915b874ce00147d08daded9f60e5ac060a4a0d2a032b57369732b29367a760dfd08450eee7960cc62a08eca6f320a88d1edac03bc66d42652

data/lib/harbr/job.rb

@@ -106,6 +106,7 @@ module Harbr
       end
 
       system("cd /var/harbr/#{manifest.name}/current && bundle install")
+      puts `lsof -i :#{port} | awk 'NR!=1 {print $2}' | xargs kill -9`
       system("sv restart #{manifest.name}")
       puts "Started container: #{manifest.name}"
       create_traefik_config(containers.all)

data/lib/harbr/next/job.rb

@@ -2,14 +2,14 @@ module Harbr
   module Next
     class Job
       include SuckerPunch::Job
-  
-      def load_manifest(container,version)
+
+      def load_manifest(container, version)
         manifest_path = "/var/harbr/#{container}/versions/#{version}/config/manifest.yml"
         raise "Manifest not found at #{manifest_path}" unless File.exist?(manifest_path)
         manifest_data = YAML.load_file(manifest_path)
         OpenStruct.new(manifest_data)
       end
-  
+
       def create_traefik_config(containers)
         config = {
           "http" => {
@@ -22,10 +22,10 @@ module Harbr
             "services" => {}
           }
         }
-  
+
         containers.each do |container|
           container.ip = "127.0.0.1"
-  
+
           config["http"]["routers"]["#{container.name}-router"] = {
             "rule" => "Host(`#{container.host_header}`)",
             "service" => "#{container.name}-service"
@@ -36,86 +36,93 @@ module Harbr
             }
           }
         end
-  
+
         File.write("/etc/traefik/harbr.toml", TomlRB.dump(config))
         puts "Traefik configuration written to /etc/traefik/harbr.toml"
       end
-  
-      def create_run_script(container_name, port)
 
+      def create_run_script(container_name, port)
         service_dir = "/etc/sv/harbr/#{container_name}/next"
-        
+
         script_template = <<~SCRIPT
           #!/bin/sh
           exec 2>&1
           cd /var/harbr/#{container_name}/next
           exec ./exe/run #{port}
         SCRIPT
-  
+
         service_dir = "/etc/sv/harbr/#{container_name}/next"
         FileUtils.mkdir_p(service_dir)
-  
+
         File.write("#{service_dir}/run", script_template)
         FileUtils.chmod("+x", "#{service_dir}/run")
         puts "Run script created and made executable for container: next.#{container_name}"
       end
-  
+
       def create_log_script(container_name)
         log_dir = "/var/log/harbr/#{container_name}/next"
-  
+
         FileUtils.mkdir_p(log_dir)
-  
+
         script_template = <<~SCRIPT
           #!/bin/sh
           exec svlogd -tt #{log_dir}/
         SCRIPT
-  
+
         dir_path = "/etc/sv/harbr/#{container_name}/next/log"
         FileUtils.mkdir_p(dir_path)
-  
+
         File.write("#{dir_path}/run", script_template)
         FileUtils.chmod("+x", "#{dir_path}/run")
         puts "Log script created and made executable for container: next.#{container_name}"
       end
-  
       def create_a_service(container_name, port)
         create_run_script(container_name, port)
         create_log_script(container_name)
+
         system("ln -s /etc/sv/harbr/#{container_name}/next /etc/service/next.#{container_name}") unless File.exist?("/etc/service/next.#{container_name}")
       end
-  
+
       def run_container(manifest)
         puts "Starting container: next.#{manifest.name}"
-        port = `port assign next.#{manifest.port}`.strip
+        port = `port assign next.#{manifest.port}"`.strip
+        puts "Port assigned: #{port}"
 
-        create_a_service(manifest.name, port)
+        puts `lsof -i :#{port} | awk 'NR!=1 {print $2}' | xargs kill -9`
+
+        `rm -rf /etc/sv/harbr/#{manifest.name}/next`
+        system("ln -s /var/harbr/#{manifest.name}/versions/#{manifest.version}/ /etc/sv/harbr/#{manifest.name}/next")
+        puts "Linked to: /etc/sv/harbr/#{manifest.name}/next"
         
+        create_a_service(manifest.name, port)
+
         containers = Container::Repository.new
         container = containers.find_by_header("next.#{manifest.host}")
-  
+
         if container.nil?
-          container = Container.new 
+          container = Container.new
           container.name = "next.#{manifest.name}"
           container.host_header = "next.#{manifest.host}"
           container.ip = "127.0.0.1"
           container.port = port
           containers.create(container)
         else
-          container.port = port      
-          containers.update(container)  
+          container.port = port
+          containers.update(container)
         end
-  
-        system("cd /var/harbr/#{manifest.name}/next && bundle install")
+
+
+        
+        system("cd /var/harbr/#{manifest.name}/next && bundle install")        
         system("sv restart next.#{manifest.name}")
         puts "Started container: next.#{manifest.name}"
         create_traefik_config(containers.all)
       end
-  
+
       def perform(container, version)
         puts "Running tasks for container: 'next.#{container}', Version: '#{version}'"
         manifest = load_manifest(container, version)
         puts "Manifest: #{manifest}"
-        system("ln -sf /var/harbr/#{container}/versions/#{version} /var/harbr/#{container}/next")
         run_container(manifest)
       end
     end

data/lib/harbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harbr
-  VERSION = "0.0.69"
+  VERSION = "0.0.71"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.71
 platform: ruby
 authors:
 - Delaney Kuldvee Burke