async-job-adapter-active_job 0.13.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4be983547a0c60486b8b1aae93ab56cbaee13f02eaf92f453449dfb9826dd1
-  data.tar.gz: b7d2dc7848fd46112f89a9f071f5f541bbbcecce7de2f45d477eaeb3c2dd4adb
+  metadata.gz: ea1f70c52b6ac8fef768e6f873af46fc7d41f0fcaf2135821a85a6585289b3e5
+  data.tar.gz: 10961b83ada11d421f0c253f54c342323e87961a8f5718326a17323aaf7d004b
 SHA512:
-  metadata.gz: ab85aae290c2f4673fb7d0ef65b96c94c50e3d511fb8148686e51d5bf31564f1ac4449fb3d3df655cc4115d45c20f0fd0c4f3cc5c07cca2925d3e93b06e6bbba
-  data.tar.gz: d84e38626ff2774069444432a29704206195403592e15b1b57a57c52cfa5e485ddcafe042357b6a0df447b7babb2a0774348460ebd979afeea3f436fab8e1131
+  metadata.gz: c1624087283cb466494db419e184a624826b072db17782e7b69a650f4acce0ef11a4f072645b1304580f5ea4febf50f1dad3c0a632ca5c9d956241f3d905f7f1
+  data.tar.gz: a890ddfc103218be83e6eb954c619e21bb1991c5c16e7a58b1c061d9c19013c3c181bd75a5c453af2c6a0b6a62cffbadfd54ab1b96aede5406aa64e9e7ca7cc0

checksums.yaml.gz.sig

@@ -1,2 +1,5 @@
-�^'|�q����~�O�2{23�&�鏯?���Ad�H��P
-�Z�L�ER9|FGOQ̘.�E��5a�.��5��i�`]fs@3�4N���̎��?#�����E���u[����H�?8���Iqqo	C�ܹ[]̈{`�Vߓ�޲��F����s�[�����e���w`��Й?XD�S�yA^�6�V�i�k�ޅA/z*K)BRD�
+P̮��
NFOAoP(��%_O���B)0���?S�
+����q���1�k�^��Ҷ�D�H�ޔ#�ɄԷ���?Z�%����y�r�z��M�kz�Fb����w�/�M��lc��7�zE���)
+Z)�AJ
+9,��j��k�	\҂�\�&L�3��<&=���/�љ�̷>� �z�|)�h�	�m:����#u��Ay>���
+#u54n�M�*�n`�.N��3�giu�?��'����B���"����|����]����q��b2U3܏��eb��KAu-�.
pLV_O9�5v�
�koxo�|�SJ�Lj�[F

data/bin/async-job-adapter-active_job-server

@@ -7,13 +7,8 @@ require 'async/service/controller'
 require 'async/job/adapter/active_job/environment'
 
 configuration = Async::Service::Configuration.build do
-	service "async-job-server" do
+	service "async-job-adapter-active_job-server" do
 		include Async::Job::Adapter::ActiveJob::Environment
-		
-		root {ENV.fetch('RAILS_ROOT', Dir.pwd)}
-		
-		# If you have multiple queues, you may want to run a separate server for each queue.
-		queue_name ENV.fetch('ASYNC_JOB_ADAPTER_ACTIVE_JOB_QUEUE_NAME', 'default')
 	end
 end
 

data/lib/active_job/queue_adapters/async_job_adapter.rb

@@ -5,6 +5,8 @@
 
 require 'active_job/queue_adapters/abstract_adapter'
 
+require 'kernel/sync'
+
 module ActiveJob
 	module QueueAdapters
 		class AsyncJobAdapter < AbstractAdapter
@@ -14,12 +16,16 @@ module ActiveJob
 			
 			# Enqueue a job for processing.
 			def enqueue(job)
-				@dispatcher.call(job)
+				Sync do
+					@dispatcher.call(job)
+				end
 			end
 			
 			# Enqueue a job for processing at a specific time.
 			def enqueue_at(job, timestamp)
-				@dispatcher.call(job)
+				Sync do
+					@dispatcher.call(job)
+				end
 			end
 		end
 	end

data/lib/async/job/adapter/active_job/dispatcher.rb

@@ -17,7 +17,7 @@ module Async
 					# Prepare the dispacher with the given definitions and aliases.
 					# @parameter definitions [Hash(String, Proc)] The definitions to use constructing queues.
 					# @parameter aliases [Hash(String, Proc)] The aliases for the definitions.
-					def initialize(definitions, aliases = {})
+					def initialize(definitions = {}, aliases = {})
 						@definitions = definitions
 						@aliases = aliases
 						
@@ -30,6 +30,9 @@ module Async
 					# @attribute [Hash(String, String)] The aliases for the definitions.
 					attr :aliases
 					
+					# @attribute [Hash(String, Queue)] The queues that have been constructed.
+					attr :queues
+					
 					# Look up a queue by name, constructing it if necessary using the given definition.
 					# @parameter name [String] The name of the queue.
 					def [](name)
@@ -50,6 +53,10 @@ module Async
 						self[name].server.start
 					end
 					
+					def keys
+						@definitions.keys
+					end
+					
 					private def build(definition)
 						builder = Builder.new(Executor::DEFAULT)
 						

data/lib/async/job/adapter/active_job/environment.rb

@@ -16,9 +16,21 @@ module Async
 						Service
 					end
 					
+					def root
+						ENV.fetch('RAILS_ROOT', Dir.pwd)
+					end
+					
+					def dispatcher
+						Railtie.dispatcher
+					end
+					
 					# The name of the queue to use.
-					def queue_name
-						"default"
+					def queue_names
+						if queue_names = ENV['ASYNC_JOB_ADAPTER_ACTIVE_JOB_QUEUE_NAMES']
+							queue_names.split(',')
+						else
+							dispatcher.keys
+						end
 					end
 				end
 			end

data/lib/async/job/adapter/active_job/service.rb

@@ -4,6 +4,8 @@
 # Copyright, 2024, by Samuel Williams.
 
 require 'async/service/generic'
+require 'console/event/failure'
+require 'async/barrier'
 
 module Async
 	module Job
@@ -15,12 +17,29 @@ module Async
 					def setup(container)
 						container.run(name: self.name, restart: true) do |instance|
 							evaluator = @environment.evaluator
+							
 							require File.expand_path('config/environment', evaluator.root)
 							
+							dispatcher = evaluator.dispatcher
+							
 							instance.ready!
 							
-							Sync do
-								Railtie.start(evaluator.queue_name)
+							Sync do |task|
+								barrier = Async::Barrier.new
+								
+								# Start all the named queues:
+								evaluator.queue_names.each do |queue_name|
+									barrier.async do
+										Console.debug(self, "Starting queue...", queue_name: queue_name)
+										dispatcher.start(queue_name)
+									rescue => error
+										Console::Event::Failure.for(error).emit(self, "Queue failed!")
+									end
+								end
+								
+								barrier.wait
+							ensure
+								barrier.stop
 							end
 						end
 					end

data/lib/async/job/adapter/active_job/thread_local_dispatcher.rb

@@ -44,6 +44,11 @@ module Async
 					def start(name)
 						dispatcher.start(name)
 					end
+					
+					# The names of all the queues that are available for processing jobs.
+					def keys
+						@definitions.keys
+					end
 				end
 			end
 		end

data/lib/async/job/adapter/active_job/version.rb

@@ -7,7 +7,7 @@ module Async
 	module Job
 		module Adapter
 			module ActiveJob
-				VERSION = "0.13.0"
+				VERSION = "0.14.1"
 			end
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-job-adapter-active_job
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-08-11 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-job