enviroblyd 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 794c9805c66ea61e73486ccc08f71077daa2e2de80e6f9c5d510ff62f038f9f5
-  data.tar.gz: 40f92e9aafc2351298c65f71ee251eb766a31abc0835ac3170ceb257ba854bfe
+  metadata.gz: 329d9e7586d58e8b529d2a94d46be76130efb24bf688a4d53efe17dfeaf3e7e0
+  data.tar.gz: 47cf08b7ecf7231460aeed688aa76705abff6cdcfdf770148f9f86f378ee513e
 SHA512:
-  metadata.gz: 4d13d6792c28d62cd0ccf872e2368dc9396523cf59d3b67b0f471e8315dad6c66a3a7f8be3d507d2e7d8ef1bae7df06c1397b587a2b56de757426d448693d4be
-  data.tar.gz: 8e0641adc0ef80bac699bd52702cbccb2ee7cdbe3d5b2d41d19f7f1e3baa27e10c6423d57a0a571d61c9f22c9f7bb088d33b8014f38067831d5bd1083b4d24b6
+  metadata.gz: f57916ca0d0615cd05cffcf15527f506a8ca60a47cec03f5d9ea4262b4ce0b298ae764cace907c764c4de9307f870659657610629c98e7ebd8d8c81388000623
+  data.tar.gz: a260266cb641e0b7e99d2e35f21cde3fcd82f80570782ce5628c4081c4e6f9773ee35ea4d660514267407ccc000146b3db1b504b60370518653f2b61c13ba719

data/bin/enviroblyd

@@ -3,4 +3,12 @@
 
 require "enviroblyd"
 
-Enviroblyd::Daemon.start
+daemon = Enviroblyd::Daemon.new
+
+trap "INT" do
+  puts "Gracefully shutting down..."
+  daemon&.shutdown
+  exit
+end
+
+daemon.listen

data/lib/enviroblyd/command.rb

@@ -1,23 +1,26 @@
 # frozen_string_literal: true
 
 require "open3"
+require "json"
 
 class Enviroblyd::Command
   DEFAULT_TIMEOUT_SECONDS = 5 * 60
   DEFAULT_RUNTIME = "/bin/bash"
 
-  def self.run(params)
-    Thread.new do
-      new(params).run
-    end
-  end
-
-  def initialize(params)
+  def initialize(message)
+    params = parse_message message
     @url = params.fetch "url"
     @script = params.fetch "script"
     @runtime = params.fetch "runtime", DEFAULT_RUNTIME
     @timeout = params.fetch "timeout", DEFAULT_TIMEOUT_SECONDS
     @stdout = @stderr = @exit_code = nil
+    @valid = true
+  rescue NoMethodError, KeyError
+    @valid = false
+  end
+
+  def valid?
+    @valid
   end
 
   def run
@@ -45,4 +48,10 @@ class Enviroblyd::Command
         }
       }
     end
+
+    def parse_message(message)
+      JSON.parse message
+    rescue
+      nil
+    end
 end

data/lib/enviroblyd/daemon.rb

@@ -1,44 +1,56 @@
 # frozen_string_literal: true
 
 require "socket"
-require "json"
 
 class Enviroblyd::Daemon
   MAX_MESSAGE_SIZE = 6000 # bytes
-  LISTEN_PORT = ENV.fetch("ENVIROBLYD_PORT", 63106).to_i
+  PORT = ENV.fetch("ENVIROBLYD_PORT", 63106).to_i
 
-  def self.start
+  def initialize
     imds = Enviroblyd::IMDS.new
-    host = imds.private_ipv4
-    new.listen(host) do
-      Enviroblyd::Web.register
-    end
+    @host = imds.private_ipv4
+    @threads = []
+    @shutdown = false
   end
 
-  def listen(host)
-    server = TCPServer.new host, LISTEN_PORT
-    puts "Listening on #{host}:#{LISTEN_PORT}"
-
-    yield
-
-    loop do
-      Thread.start(server.accept) do |client|
-        params =
-          begin
-            JSON.parse client.recv(MAX_MESSAGE_SIZE)
-          rescue
-            nil
-          end
-
-        if params.nil?
-          client.puts "Error parsing JSON"
-        else
-          client.puts "OK"
+  def listen
+    @server = TCPServer.new @host, PORT
+    puts "Listening on #{@host}:#{PORT}"
+    Enviroblyd::Web.register
+
+    until @shutdown do
+      @threads << Thread.start(@server.accept) do |client|
+        message = client.recv(MAX_MESSAGE_SIZE)
+        command = Enviroblyd::Command.new message
+
+        unless command.valid?
+          puts "Invalid message received: #{message}"
+          client.puts "Invalid message"
+          next
         end
 
+        client.puts "OK"
+        client.close
+        command.run
+      ensure
         client.close
-        Enviroblyd::Command.run(params) if params
       end
+
+      delete_dead_threads
+      GC.start
+      GC.compact
     end
   end
+
+  def shutdown
+    @threads.each(&:join)
+  end
+
+  private
+    def delete_dead_threads
+      @threads.each do |thread|
+        next if thread.alive?
+        @threads.delete thread
+      end
+    end
 end

data/lib/enviroblyd/imds.rb

@@ -6,7 +6,8 @@ class Enviroblyd::IMDS
 
   def initialize
     @token = Enviroblyd::Web.http("http://#{IMDS_HOST}/latest/api/token",
-      type: Net::HTTP::Put, headers: { "X-aws-ec2-metadata-token-ttl-seconds" => TOKEN_TTL_SECONDS.to_s }).
+      type: Net::HTTP::Put,
+      headers: { "X-aws-ec2-metadata-token-ttl-seconds" => TOKEN_TTL_SECONDS.to_s }).
       body.strip
   end
 

data/lib/enviroblyd/version.rb

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

data/lib/enviroblyd/web.rb

@@ -33,8 +33,8 @@ class Enviroblyd::Web
 
     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
+        puts "Retried #{url} #{tries} times. Aborting."
+        return
       end
 
       uri = URI(url)
@@ -56,7 +56,7 @@ class Enviroblyd::Web
 
       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"
+        puts "Retry #{uri} in #{sleep_time}s"
         sleep sleep_time
         http(url, type:, params:, retry_interval:, retries:, backoff:, tries: (tries + 1))
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enviroblyd
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2024-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor