fractor 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3fc9be0fb1d8993186e56bbef30b33396314e878f8a9ea3d31d79efd3c46f06
-  data.tar.gz: 8edb3ff38f5c054d9c1e477bfb799605fd4827eb679dc10db224ad1eb45e8d64
+  metadata.gz: b51bfbe1d8aac8575dcd85deb88b286b8f3b26e391a228e01d43f3a466d91f26
+  data.tar.gz: '08198a0b664d2ddfa9cbef0a173f1672f9584dba1700f82374b0b9916cad91a6'
 SHA512:
-  metadata.gz: 17fbad9c566525c9b01ccd8f613a6fe2eb2be62298894fc4ae636736ad678f3d1c46fbf49cce5e84d6e3584cc0a5e31ce06f92a994f2a3b92e58cceedabafcbc
-  data.tar.gz: a33d27eb70ffbd8769c6db1f5484788d0b187b5c1feb33ba65602579a2ecc17c3c14be6654ad74c414a63cf9b5d19a818bd462293eca0ca13bfd1f92272760f1
+  metadata.gz: af7c2e42e19b28ced53b9e3aecf37409b9aff3c92d8829a0835312a4a5852069530b36f57c01c84727d09ad9de3b308ecfa05a5a812454402a300219938bce19
+  data.tar.gz: e08de69150ff8d528d481fcb1e872cd2d274e6b332f6d2ad3ad3b879e13328d50af3fae3294aecd81851dc7d6f3f6cc317570a7978b0f1a8adcd142d4b18a8f5

data/lib/fractor/result_aggregator.rb

@@ -13,10 +13,10 @@ module Fractor
 
     def add_result(result)
       if result.success?
-        puts "Work completed successfully: Result: #{result.result}"
+        puts "Work completed successfully: Result: #{result.result}" if ENV["FRACTOR_DEBUG"]
         @results << result
       else
-        puts "Error processing work: #{result}"
+        puts "Error processing work: #{result}" if ENV["FRACTOR_DEBUG"]
         @errors << result
       end
 

data/lib/fractor/supervisor.rb

@@ -88,19 +88,32 @@ module Fractor
 
     # Sets up a signal handler for graceful shutdown (Ctrl+C).
     def setup_signal_handler
-      # Need access to @workers within the trap block
+      # Store instance variables in local variables for the signal handler
       workers_ref = @workers
+
+      # Trap INT signal (Ctrl+C)
       Signal.trap("INT") do
-        puts "\nCtrl+C received. Initiating immediate shutdown..."
-        puts "Attempting to close worker Ractors..."
+        puts "\nCtrl+C received. Initiating immediate shutdown..." if ENV["FRACTOR_DEBUG"]
+
+        # Set running to false to break the main loop
+        @running = false
+
+        puts "Sending shutdown message to all Ractors..." if ENV["FRACTOR_DEBUG"]
+
+        # Send shutdown message to each worker Ractor
         workers_ref.each do |w|
-          w.close # Use the close method of WrappedRactor
-          puts "Closed Ractor: #{w.name}"
+          w.send(:shutdown)
+          puts "Sent shutdown to Ractor: #{w.name}" if ENV["FRACTOR_DEBUG"]
         rescue StandardError => e
-          puts "Error closing Ractor #{w.name}: #{e.message}"
+          puts "Error sending shutdown to Ractor #{w.name}: #{e.message}" if ENV["FRACTOR_DEBUG"]
         end
-        puts "Exiting now."
-        exit(1) # Exit immediately
+
+        puts "Exiting now." if ENV["FRACTOR_DEBUG"]
+        exit!(1) # Use exit! to exit immediately without running at_exit handlers
+      rescue Exception => e
+        puts "Error in signal handler: #{e.class}: #{e.message}" if ENV["FRACTOR_DEBUG"]
+        puts e.backtrace.join("\n") if ENV["FRACTOR_DEBUG"]
+        exit!(1)
       end
     end
 
@@ -208,7 +221,7 @@ module Fractor
     # Stop the supervisor (for continuous mode)
     def stop
       @running = false
-      puts "Stopping supervisor..."
+      puts "Stopping supervisor..." if ENV["FRACTOR_DEBUG"]
     end
 
     private

data/lib/fractor/version.rb

@@ -2,5 +2,5 @@
 
 module Fractor
   # Fractor version
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/fractor/wrapped_ractor.rb

@@ -9,7 +9,7 @@ module Fractor
     # Initializes the WrappedRactor with a name and the Worker class to instantiate.
     # The worker_class parameter allows flexibility in specifying the worker type.
     def initialize(name, worker_class)
-      puts "Creating Ractor #{name} with worker #{worker_class}"
+      puts "Creating Ractor #{name} with worker #{worker_class}" if ENV["FRACTOR_DEBUG"]
       @name = name
       @worker_class = worker_class # Store the worker class
       @ractor = nil # Initialize ractor as nil
@@ -17,10 +17,10 @@ module Fractor
 
     # Starts the underlying Ractor.
     def start
-      puts "Starting Ractor #{@name}"
+      puts "Starting Ractor #{@name}" if ENV["FRACTOR_DEBUG"]
       # Pass worker_class to the Ractor block
       @ractor = Ractor.new(@name, @worker_class) do |name, worker_cls|
-        puts "Ractor #{name} started with worker class #{worker_cls}"
+        puts "Ractor #{name} started with worker class #{worker_cls}" if ENV["FRACTOR_DEBUG"]
         # Yield an initialization message
         Ractor.yield({ type: :initialize, processor: name })
 
@@ -29,19 +29,26 @@ module Fractor
 
         loop do
           # Ractor.receive will block until a message is received
-          puts "Waiting for work in #{name}"
+          puts "Waiting for work in #{name}" if ENV["FRACTOR_DEBUG"]
           work = Ractor.receive
-          puts "Received work #{work.inspect} in #{name}"
+
+          # Handle shutdown message
+          if work == :shutdown
+            puts "Received shutdown message in Ractor #{name}, terminating..." if ENV["FRACTOR_DEBUG"]
+            break
+          end
+
+          puts "Received work #{work.inspect} in #{name}" if ENV["FRACTOR_DEBUG"]
 
           begin
             # Process the work using the instantiated worker
             result = worker.process(work)
-            puts "Sending result #{result.inspect} from Ractor #{name}"
+            puts "Sending result #{result.inspect} from Ractor #{name}" if ENV["FRACTOR_DEBUG"]
             # Yield the result back
             Ractor.yield({ type: :result, result: result, processor: name })
           rescue StandardError => e
             # Handle errors during processing
-            puts "Error processing work #{work.inspect} in Ractor #{name}: #{e.message}\n#{e.backtrace.join("\n")}"
+            puts "Error processing work #{work.inspect} in Ractor #{name}: #{e.message}\n#{e.backtrace.join("\n")}" if ENV["FRACTOR_DEBUG"]
             # Yield an error message back
             # Ensure the original work object is included in the error result
             error_result = Fractor::WorkResult.new(error: e.message, work: work)
@@ -49,14 +56,14 @@ module Fractor
           end
         end
       rescue Ractor::ClosedError
-        puts "Ractor #{name} closed."
+        puts "Ractor #{name} closed." if ENV["FRACTOR_DEBUG"]
       rescue StandardError => e
-        puts "Unexpected error in Ractor #{name}: #{e.message}\n#{e.backtrace.join("\n")}"
+        puts "Unexpected error in Ractor #{name}: #{e.message}\n#{e.backtrace.join("\n")}" if ENV["FRACTOR_DEBUG"]
         # Optionally yield a critical error message if needed
       ensure
-        puts "Ractor #{name} shutting down."
+        puts "Ractor #{name} shutting down." if ENV["FRACTOR_DEBUG"]
       end
-      puts "Ractor #{@name} instance created: #{@ractor}"
+      puts "Ractor #{@name} instance created: #{@ractor}" if ENV["FRACTOR_DEBUG"]
     end
 
     # Sends work to the Ractor if it's active.
@@ -66,11 +73,11 @@ module Fractor
           @ractor.send(work)
           true
         rescue Exception => e
-          puts "Warning: Error sending work to Ractor #{@name}: #{e.message}"
+          puts "Warning: Error sending work to Ractor #{@name}: #{e.message}" if ENV["FRACTOR_DEBUG"]
           false
         end
       else
-        puts "Warning: Attempted to send work to nil Ractor #{@name}"
+        puts "Warning: Attempted to send work to nil Ractor #{@name}" if ENV["FRACTOR_DEBUG"]
         false
       end
     end
@@ -108,7 +115,7 @@ module Fractor
 
         true
       rescue Exception => e
-        puts "Warning: Error closing Ractor #{@name}: #{e.message}"
+        puts "Warning: Error closing Ractor #{@name}: #{e.message}" if ENV["FRACTOR_DEBUG"]
         # Consider it closed even if there was an error
         @ractor = nil
         true
@@ -131,7 +138,7 @@ module Fractor
         false
       rescue Exception => e
         # If we get an exception, the Ractor is likely terminated
-        puts "Ractor #{@name} appears to be terminated: #{e.message}"
+        puts "Ractor #{@name} appears to be terminated: #{e.message}" if ENV["FRACTOR_DEBUG"]
         @ractor = nil
         true
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fractor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ronald Tse