enviroblyd 0.4 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bfe5d8525ca24df27fe3c85f2715a6dc74d9bd931aff02c1a1c96c79b4b8c98
-  data.tar.gz: cb67d4b4c55e328c63e85ad6a976b24fd29e7517ec5de154ae613fe2712a7ec8
+  metadata.gz: 28e33b71b8d370a6ea6239748afe9e0bbb6023325cd3f46ae070e2e8433531f3
+  data.tar.gz: 3485336ad0bff70f3bb983d9487ad650c8b18f5afce4a45e2ec4a2ef167815f8
 SHA512:
-  metadata.gz: 30ce5bcada6cd8abdfc0ab7f8cf58e15b3670f55f659d2b40bec9ef75e502ca8e65fbd6ab7e13fc42ec5d7cae362522f1e82645a746b24f7fb8ba2218677029e
-  data.tar.gz: 6125a642bc7ecad4db9ea7c50f2039584a7f7ddccd4a1f41663bff22318149c78333bd936cf5d023e5e409b69beebd71ea854919b89cc479ca93c12587943c15
+  metadata.gz: 3c303fba4a8693104fe31b69fd6af04a8d4c1899a51c9c8f949bec21dd8f378fefcc9fb81161db793b4344f9eceffe3d160e0e0bb04709e8dcbc9c555ce7f163
+  data.tar.gz: dd2b1d9035182ec8a18ed9f3b2cff027afe017f7c37f3b2d31b142b1ae92a783461c716d7804d2daf4a109bad334eae3ce47d09f9dc0efdc0574ffce2583a707

data/lib/enviroblyd/command.rb

@@ -27,6 +27,7 @@ class Enviroblyd::Command
     end
 
     puts "Command #{@url} exited with #{@exit_code}"
+    $stdout.flush
 
     @web.http(@url, type: Net::HTTP::Put, params: to_complete_params)
   end

data/lib/enviroblyd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enviroblyd
-  VERSION = "0.4"
+  VERSION = "0.4.2"
 end

data/lib/enviroblyd/web.rb

@@ -22,7 +22,7 @@ class Enviroblyd::Web
     else
       init_url = ENV.fetch "ENVIROBLYD_INIT_URL"
       puts "Init URL: #{init_url}"
-      response = http(init_url, type: Net::HTTP::Put, retry_interval: 3, retries: 10, backoff: :exponential)
+      response = http(init_url, type: Net::HTTP::Put)
       puts "Init response code: #{response.code}"
 
       if response.code.to_i == 200
@@ -32,7 +32,7 @@ class Enviroblyd::Web
     end
   end
 
-  def http(url, type: Net::HTTP::Get, headers: {}, retry_interval: 2, retries: 30, backoff: false, tries: 1, params: nil)
+  def http(url, type: Net::HTTP::Get, params: nil, headers: {}, retry_interval: 3, retries: 10, backoff: :exponential, tries: 1)
     if retries <= tries
       $stderr.puts "Retried #{tries} times. Aborting."
       exit 1
@@ -41,15 +41,12 @@ class Enviroblyd::Web
     uri = URI(url)
     http = Net::HTTP.new uri.host, uri.port
     http.use_ssl = true if uri.scheme == "https"
-    http.open_timeout = 5
-    http.read_timeout = 5
+    http.open_timeout = 10
+    http.read_timeout = 10
 
     request = type.new(uri, default_headers.merge(headers))
     request.content_type = CONTENT_TYPE
-
-    unless params.nil?
-      request.body = JSON.dump params
-    end
+    request.body = JSON.dump(params) unless params.nil?
 
     response =
       begin
@@ -58,12 +55,11 @@ class Enviroblyd::Web
         :retry
       end
 
-    # https://developers.cloudflare.com/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/
     if response == :retry || (500..599).include?(response.code.to_i)
       sleep_time = (backoff == :exponential) ? (retry_interval * tries) : retry_interval
       $stderr.puts "Retry #{uri} in #{sleep_time}s"
       sleep sleep_time
-      http(url, type:, retry_interval:, retries:, backoff:, tries: (tries + 1))
+      http(url, type:, params:, retry_interval:, retries:, backoff:, tries: (tries + 1))
     else
       response
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enviroblyd
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.2
 platform: ruby
 authors:
 - Robert Starsi