mkit 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49770b23e6d2af3c26a6b8e32291ad24b60e56f6e6fee0f308e3c96fd54f9591
-  data.tar.gz: 2fe4f45739fd054f2399f4d1544b0d2bd736a5cc656ffad79da24a97b24e489d
+  metadata.gz: 5ce73321371e8f675a5c28106e9287762ed5cf8b39ecfc8c97b35f62806a45c1
+  data.tar.gz: 21189b10e952913a03d50498201869010fef447f4b621a5f3e2f39a1ab12c94c
 SHA512:
-  metadata.gz: c35ab575b4bac80ea1291802c1ee09260529eea8d348b51b22adcd582789f1a902e7f6c1350e3b538b16064dbcaeece6afb80623565e0757f2905f8ffe9ddfa3
-  data.tar.gz: 5a76b2d8f36eb02815674b1b0af00c8508e8f6dec4f978156e58c8587f01a846ce9bb7c3865887b7452ae2c5232fd10758cde62e800b4104410458234e7cf915
+  metadata.gz: e38e72898702d11bf928534444a63fe1744b3af47494c4da7789ece5c01cb611b824e716cc7cc39454c738d730da5533393aefea8801da236ecce97d9b291f3e
+  data.tar.gz: 2e2d930ef466b48fbb75b07dbf12586cb41e0324a043eed2f334b9d4a638ba9369f6d65f85ca6c24d4573d8076dacfb26d43bc166de465212df8dbda3ee4edae

data/lib/mkit/docker_listener.rb

@@ -5,16 +5,32 @@ require 'mkit/status'
 # https://docs.docker.com/engine/reference/commandline/events
 require 'mkit/app/helpers/docker_helper'
 module MKIt
+class StopThread < RuntimeError; end
+
   class DockerListener
     include MKIt::DockerHelper
 
     def initialize
-      @consumers = []
+      @queue = Queue.new
+    end
+
+    def enqueue(msg)
+      @queue << msg
     end
 
-    def register_consumer(consumer:)
+    def start
+      @consumer.run if register_consumer
+      @listener.run if register_listener
     end
 
+    def stop
+      @listener.exit if @listener
+      @consumer.raise StopThread.new
+      MKItLogger.info("docker listener stopped")
+    end
+
+    private
+
     def parse_message(msg)
       action = msg['Action'].to_sym
       type = msg['Type'].to_sym
@@ -45,15 +61,17 @@ module MKIt
             MKItLogger.debug("	#{type} #{action} <<TODO>>")
           end
         else
-          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}")
+          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
         end
       when :network
         pod_id = msg.Actor.Attributes.container
-        pod = Pod.find_by(pod_id: pod_id)
+        inspect = inspect_instance(pod_id).to_o
+        pod_name = inspect.Name[1..]
+        pod = Pod.find_by(name: pod_name)
         unless pod.nil?
           case action
           when :connect
-            MKItLogger.info("docker network #{action} received: #{msg}")
+            MKItLogger.info("docker network #{action} received: #{msg} for pod #{pod_name}")
             pod.update_ip
             pod.save
           when :disconnect
@@ -62,20 +80,41 @@ module MKIt
             MKItLogger.debug("  #{type} #{action} <<TODO>>")
           end
         else
-          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}")
+          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
         end
       else
         MKItLogger.info("\t#{type} #{action} <<unknown>>")
       end
     end
 
-    def start
-      @thread ||= Thread.new {
+    def register_consumer
+      return false unless @consumer.nil?
+
+      @consumer = Thread.new do
+        running = true
+        while running
+          begin
+            parse_message(@queue.pop)
+          rescue StopThread
+            running = false
+            MKItLogger.info("docker consumer ended")
+          rescue => e
+            MKItLogger.error("error while consuming docker notification: #{e}", e.message, e.backtrace.join("\n"))
+          end
+        end
+      end
+      true
+    end
+
+    def register_listener
+      return false unless @listener.nil?
+
+      @listener = Thread.new {
         cmd = "docker events --format '{{json .}}'"
         begin
           PTY.spawn( cmd ) do |stdout, stdin, pid|
             begin
-              stdout.each { |line| parse_message JSON.parse(line).to_o }
+              stdout.each { |line| enqueue JSON.parse(line).to_o }
             rescue Errno::EIO
               MKItLogger.warn("Errno:EIO error, but this probably just means " +
                 "that the process has finished giving output")
@@ -85,12 +124,8 @@ module MKIt
           MKItLogger.warn("docker event listener process exited!")
         end
       }
-      @thread.run
       MKItLogger.info("docker listener started")
-    end
-    def stop
-      @thread.exit if @thread
-      MKItLogger.info("docker listener stopped")
+      true
     end
   end
 end

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Vasco Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-dns