harbr 0.1.60 → 0.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440d1e8837aa9a47180c1de066f99ea28a572c5455856a04cd4e92d0b663f502
-  data.tar.gz: 198967d2d4450023705023e3332e1f85ea5da524944440e41d2983d8e9fbe85b
+  metadata.gz: 1b8c14de80eaf1bb31a4cc7fbd90444d49cdbbd324ccdbaff560b46a0cc6b081
+  data.tar.gz: a9834605ae59ca99428a193c3432d85d94e72f1762eb3a2bdbd7295126b769be
 SHA512:
-  metadata.gz: ff337dca9b6cb7084f19d89974dfad16b833bcd0a71c190cdfc86edf93d555d6a6857cfce8c33f59664d170e00ae1681063c845c9b1b0f16f7f924d2cdcd07a1
-  data.tar.gz: 4c6501fe96e399e5fa466f6219f3b3519228e3f6a285b2a47ce9330591b4acff6e6a7d3a5c3fde9610c6cf302b6a2639f1183b18b3bf817c6ce0cba460911708
+  metadata.gz: f8bf85e398d659feb4967e62542c7756cbf38f7d76ac870165e3bcd9cf025c7ac4e1ecdcdbee8750a663b33d37b9f291ac1ab041b96396b07013149c5350b15f
+  data.tar.gz: 5c350932f47d39bef85a603e31a30486e5dac807a3a5a099b059bb9a03114c4f73967bd793ddfd229adf3bf934a67b8e28b652c0c3aa96f2094eb302b411a1fb

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/exe/harbr

@@ -190,14 +190,10 @@ class HarbrCLI < Thor
     /versions\/(?<version>\d*)/.match(`ls -l /var/harbr/containers/#{name}/next`)
     version = $1
     raise "Ooops! next version not found!" if version.nil?
-
-
+    
     /versions\/(?<version>\d*)/.match(`ls -l /var/harbr/containers/#{name}/current`)
     `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
 
-
-    `rm -rf /var/harbr/containers/#{name}/current`
-
     Harbr::Job.perform_async(name, version, "current")
 
     puts "deploy current version #{version} of #{name}"

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"
       
 
 
@@ -180,7 +180,7 @@ module Harbr
         `chmod +x /etc/sv/harbr/#{name}/finish`
         `chmod +x /etc/sv/harbr/#{name}/log/run`
         `mkdir -p /var/log/harbr/#{name}`
-        
+
       end
 
       
@@ -197,7 +197,7 @@ module Harbr
       if env == "current"
       
       `rm -f /etc/service/#{name}`
-      `rm -f /var/harbr/containers/#{name}`
+      `rm -f /var/harbr/containers/#{name}/current`
 
       `ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current`
       `ln -sf /etc/sv/harbr/#{name} /etc/service/#{name}`
@@ -225,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.60"
+  VERSION = "0.1.62"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.60
+  version: 0.1.62
 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"