harbr 0.1.59 → 0.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e56262ec27753fc415e7e48325aec332145488ec6e0e3a689b00157068547ca
-  data.tar.gz: c8baafeb348d432669ed3364661a13144f8e0a184f5691aec82d9662e981647c
+  metadata.gz: c1981cd906aad0aa7276bcf5a4000bca22a4c64c60d5c65fb6035938fc4752af
+  data.tar.gz: d1085ae8703b5f65ebed446d75072886df693d6dfa44c64a1dc7170e8794f059
 SHA512:
-  metadata.gz: '0339b59014fd96460c44617f351be1303a0c963e15d1e6cb3c308c89368bff436b59f15c6993c2f5df59caba2d8b690f194c0f6b3bff79dc056970ef48b8c091'
-  data.tar.gz: eba0044d3a43226387a901c2dae9551b9ddb48ac0a3b34f6f519a434795f4aca533c5d14e35982018fabbd8a71d654cffcf4608f7e762c17b125961915cd284b
+  metadata.gz: 16cc4ec3fb5e405eaf03c472336913f5be3ae8071aaf95c3379a2bd124219164f8b66588729117c24c2d94508ee4c9f8085b19774c1ab8793956d4fe1b4a7523
+  data.tar.gz: acd9c634875e20c3b0a8bacc14e4f91ebfc68f6ae799306e481eed2799bdf77d5f228714df79d61f46246b33161b534db62a41b1614f725be055701b1b2e38a1

data/!

@@ -0,0 +1,51 @@
+release 0.1.60
+
+add logging and fix finisg script
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# On branch main
+# Your branch is up to date with 'origin/main'.
+#
+# Changes to be committed:
+#	modified:   lib/harbr/job.rb
+#	modified:   lib/harbr/version.rb
+#
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+diff --git a/lib/harbr/job.rb b/lib/harbr/job.rb
+index 747fa75..6ece813 100644
+--- a/lib/harbr/job.rb
++++ b/lib/harbr/job.rb
+@@ -169,15 +169,18 @@ module Harbr
+         `chmod +x /etc/sv/harbr/#{name}/#{env}/run`
+         `chmod +x /etc/sv/harbr/#{name}/#{env}/finish`
+         `chmod +x /etc/sv/harbr/#{name}/#{env}/log/run`
++        `mkdir -p /var/log/harbr/#{name}/#{env}`
+       end
+ 
+       if env == "current"
+         write_to_file "/etc/sv/harbr/#{name}/run", run_script
+         write_to_file "/etc/sv/harbr/#{name}/log/run", log_script
+-        write_to_file "/etc/sv/harbr/#{name}/log/finish", finish_script
++        write_to_file "/etc/sv/harbr/#{name}/finish", finish_script
+         `chmod +x /etc/sv/harbr/#{name}/run`
+         `chmod +x /etc/sv/harbr/#{name}/finish`
+         `chmod +x /etc/sv/harbr/#{name}/log/run`
++        `mkdir -p /var/log/harbr/#{name}`
++        
+       end
+ 
+       
+diff --git a/lib/harbr/version.rb b/lib/harbr/version.rb
+index 89cc745..88176bf 100644
+--- a/lib/harbr/version.rb
++++ b/lib/harbr/version.rb
+@@ -1,5 +1,5 @@
+ # frozen_string_literal: true
+ 
+ module Harbr
+-  VERSION = "0.1.59"
++  VERSION = "0.1.60"
+ end

data/lib/harbr/job.rb

@@ -123,8 +123,8 @@ module Harbr
 
       version_path = "/var/harbr/containers/#{name}/versions/#{version}"
 
-      system "sv stop #{env}.#{name}" if env == "next"
-      system "sv stop #{name}" if env == "current"
+      #system "sv stop #{env}.#{name}" if env == "next"
+      #system "sv stop #{name}" if env == "current"
 
       bundle_install_if_needed(version_path)
 
@@ -137,8 +137,8 @@ module Harbr
 
       create_traefik_config(containers)
 
-      system "sv start #{env}.#{name}" if env == "next"
-      system "sv start #{name}" if env == "current"
+      system "sv restart #{env}.#{name}" if env == "next"
+      system "sv restart #{name}" if env == "current"
       
 
 
@@ -169,15 +169,18 @@ module Harbr
         `chmod +x /etc/sv/harbr/#{name}/#{env}/run`
         `chmod +x /etc/sv/harbr/#{name}/#{env}/finish`
         `chmod +x /etc/sv/harbr/#{name}/#{env}/log/run`
+        `mkdir -p /var/log/harbr/#{name}/#{env}`
       end
 
       if env == "current"
         write_to_file "/etc/sv/harbr/#{name}/run", run_script
         write_to_file "/etc/sv/harbr/#{name}/log/run", log_script
-        write_to_file "/etc/sv/harbr/#{name}/log/finish", finish_script
+        write_to_file "/etc/sv/harbr/#{name}/finish", finish_script
         `chmod +x /etc/sv/harbr/#{name}/run`
         `chmod +x /etc/sv/harbr/#{name}/finish`
         `chmod +x /etc/sv/harbr/#{name}/log/run`
+        `mkdir -p /var/log/harbr/#{name}`
+
       end
 
       
@@ -222,21 +225,22 @@ module Harbr
           exec 2>&1
           cd /var/harbr/containers/#{@container_name}/#{@env}
           exec ./exe/run #{@port} #{@env}
+          echo "started #{@container_name} on port #{@port}"
         SCRIPT
       end
 
       def finish_script
         <<~SCRIPT
           #!/bin/sh
-          sleep 1
           lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill
-          sleep 1
+          echo "killed #{@container_name} on port #{@port}"
         SCRIPT
       end
 
       def log_script
         <<~SCRIPT
           #!/bin/sh
+          echo "starting log for #{@container_name} on port #{@port}"
           exec svlogd -tt /var/log/harbr/#{@container_name}/#{@env}/
         SCRIPT
       end

data/lib/harbr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.59
+  version: 0.1.61
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
@@ -132,6 +132,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- "!"
 - ".data/development/Harbr::Port.dir"
 - ".data/development/Harbr::Port.pag"
 - ".rspec"