cloudi 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1f808877875a04bb8cc6d8032477b6b44e0e763ad360f38a3c48bd3cb3d233
-  data.tar.gz: 1d49c29f896452019b72277eadb93825dea75a3db72848bab5aa0b65bde83f69
+  metadata.gz: c215eeae654dce44290b1d2429d205978668b013e66f421c667b2e21966432da
+  data.tar.gz: e888c9c3acffc6ba370e014fe0a263932b421be0456876ae69499f99af1e1775
 SHA512:
-  metadata.gz: 040ba56cf7b16795208479b2d4c8fd0a0fe79f140fe0ca30b6f71c026d7398f8fa583b0de0d8a37667fd6eb9588f7ac0a912d19c6f4102b6aa72c0acf6bc4770
-  data.tar.gz: fbb6fea699893de2a12b53308b7f48afe84daa2a6caaa50edfad30afce2e893a4314475fe751b8c947b0175f2e1b4dfd353e513169aa41cd66b20e53f2a1a6dc
+  metadata.gz: ccb87d7df1269f529979319aae3efea2c3b33667b1cee73f1febf46937f095fa0c222c20503d6d1c3e263bc01ee22163157547690ea06e6904e5ff5373b1e79c
+  data.tar.gz: 78589425efc100a8c3f558f4e74f89d737321d2e7bdcb7e952cf0e96d89f3b00650c5c51510a7fb71a3ed364e615353861a02be45c281c4540091b1c25f7f723

data/README.markdown

@@ -1,7 +1,7 @@
 `cloudi_api_ruby`
 =================
 
-[![Build Status](https://travis-ci.org/CloudI/cloudi_api_ruby.png)](https://travis-ci.org/CloudI/cloudi_api_ruby)
+[![Build Status](https://app.travis-ci.com/CloudI/cloudi_api_ruby.svg?branch=master)](https://app.travis-ci.com/CloudI/cloudi_api_ruby)
 [![Gem Package Version](https://img.shields.io/gem/v/cloudi.svg?maxAge=2592000)](https://rubygems.org/gems/cloudi)
 
 Ruby [CloudI API](https://cloudi.org/api.html#1_Intro)

data/lib/cloudi.rb

@@ -4,7 +4,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2011-2021 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2011-2023 Michael Truog <mjtruog at protonmail dot com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -43,7 +43,7 @@ module CloudI
 
         def initialize(thread_index)
             protocol = API.getenv('CLOUDI_API_INIT_PROTOCOL')
-            buffer_size_str = API.getenv('CLOUDI_API_INIT_BUFFER_SIZE')
+            buffer_size = API.getenv_to_uint('CLOUDI_API_INIT_BUFFER_SIZE')
             if protocol == 'tcp'
                 @s = IO.for_fd(thread_index + 3, File::RDWR, autoclose: false)
                 @s.sync = true
@@ -62,7 +62,7 @@ module CloudI
             end
             @initialization_complete = false
             @terminate = false
-            @size = buffer_size_str.to_i
+            @size = buffer_size
             @callbacks = Hash.new
             @timeout_terminate = 10 # TIMEOUT_TERMINATE_MIN
             send(Erlang.term_to_binary(:init))
@@ -80,8 +80,7 @@ module CloudI
         attr_reader :priority_default
 
         def self.thread_count
-            s = getenv('CLOUDI_API_INIT_THREAD_COUNT')
-            s.to_i
+            return API.getenv_to_uint('CLOUDI_API_INIT_THREAD_COUNT')
         end
 
         def subscribe(pattern, function)
@@ -166,66 +165,70 @@ module CloudI
         end
 
         def forward_(request_type, name, request_info, request,
-                     timeout, priority, trans_id, pid)
+                     timeout, priority, trans_id, source)
             case request_type
             when ASYNC
                 forward_async(name, request_info, request,
-                              timeout, priority, trans_id, pid)
+                              timeout, priority, trans_id, source)
             when SYNC
                 forward_sync(name, request_info, request,
-                             timeout, priority, trans_id, pid)
+                             timeout, priority, trans_id, source)
             end
         end
 
         def forward_async(name, request_info, request,
-                          timeout, priority, trans_id, pid)
+                          timeout, priority, trans_id, source)
             send(Erlang.term_to_binary([:forward_async, name,
                                         OtpErlangBinary.new(request_info),
                                         OtpErlangBinary.new(request),
                                         timeout, priority,
-                                        OtpErlangBinary.new(trans_id), pid]))
+                                        OtpErlangBinary.new(trans_id),
+                                        source]))
             raise ForwardAsyncException
         end
 
         def forward_sync(name, request_info, request,
-                         timeout, priority, trans_id, pid)
+                         timeout, priority, trans_id, source)
             send(Erlang.term_to_binary([:forward_sync, name,
                                         OtpErlangBinary.new(request_info),
                                         OtpErlangBinary.new(request),
                                         timeout, priority,
-                                        OtpErlangBinary.new(trans_id), pid]))
+                                        OtpErlangBinary.new(trans_id),
+                                        source]))
             raise ForwardSyncException
         end
 
         def return_(request_type, name, pattern, response_info, response,
-                    timeout, trans_id, pid)
+                    timeout, trans_id, source)
             case request_type
             when ASYNC
                 return_async(name, pattern, response_info, response,
-                             timeout, trans_id, pid)
+                             timeout, trans_id, source)
             when SYNC
                 return_sync(name, pattern, response_info, response,
-                            timeout, trans_id, pid)
+                            timeout, trans_id, source)
             end
         end
 
         def return_async(name, pattern, response_info, response,
-                         timeout, trans_id, pid)
+                         timeout, trans_id, source)
             send(Erlang.term_to_binary([:return_async, name, pattern,
                                         OtpErlangBinary.new(response_info),
                                         OtpErlangBinary.new(response),
                                         timeout,
-                                        OtpErlangBinary.new(trans_id), pid]))
+                                        OtpErlangBinary.new(trans_id),
+                                        source]))
             raise ReturnAsyncException
         end
 
         def return_sync(name, pattern, response_info, response,
-                        timeout, trans_id, pid)
+                        timeout, trans_id, source)
             send(Erlang.term_to_binary([:return_sync, name, pattern,
                                         OtpErlangBinary.new(response_info),
                                         OtpErlangBinary.new(response),
                                         timeout,
-                                        OtpErlangBinary.new(trans_id), pid]))
+                                        OtpErlangBinary.new(trans_id),
+                                        source]))
             raise ReturnSyncException
         end
 
@@ -242,13 +245,33 @@ module CloudI
             return poll_request(nil, false)
         end
 
+        def self.process_index_
+            return API.getenv_to_uint('CLOUDI_API_INIT_PROCESS_INDEX')
+        end
+
+        def self.process_count_max_
+            return API.getenv_to_uint('CLOUDI_API_INIT_PROCESS_COUNT_MAX')
+        end
+
+        def self.process_count_min_
+            return API.getenv_to_uint('CLOUDI_API_INIT_PROCESS_COUNT_MIN')
+        end
+
+        def self.timeout_initialize_
+            return API.getenv_to_uint('CLOUDI_API_INIT_TIMEOUT_INITIALIZE')
+        end
+
+        def self.timeout_terminate_
+            return API.getenv_to_uint('CLOUDI_API_INIT_TIMEOUT_TERMINATE')
+        end
+
         def null_response(request_type, name, pattern, request_info, request,
-                          timeout, priority, trans_id, pid)
+                          timeout, priority, trans_id, source)
             return ''
         end
 
         def callback(command, name, pattern, request_info, request,
-                     timeout, priority, trans_id, pid)
+                     timeout, priority, trans_id, source)
             function_queue = @callbacks.fetch(pattern, nil)
             if function_queue.nil?
                 function = method(:null_response)
@@ -262,7 +285,8 @@ module CloudI
                 begin
                     response = function.call(ASYNC, name, pattern,
                                              request_info, request,
-                                             timeout, priority, trans_id, pid)
+                                             timeout, priority,
+                                             trans_id, source)
                     if response.kind_of?(Array)
                         API.assert{response.length == 2}
                         response_info = response[0]
@@ -296,9 +320,12 @@ module CloudI
                     $stderr.puts e.backtrace
                     return
                 rescue StandardError => e
-                    return_null_response = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
+                    if @fatal_exceptions
+                        exit(1)
+                    end
+                    return_null_response = true
                 rescue SystemExit => e
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
@@ -314,14 +341,15 @@ module CloudI
                 end
                 begin
                     return_async(name, pattern, response_info, response,
-                                 timeout, trans_id, pid)
+                                 timeout, trans_id, source)
                 rescue ReturnAsyncException
                 end
             when MESSAGE_SEND_SYNC
                 begin
                     response = function.call(SYNC, name, pattern,
                                              request_info, request,
-                                             timeout, priority, trans_id, pid)
+                                             timeout, priority,
+                                             trans_id, source)
                     if response.kind_of?(Array)
                         API.assert{response.length == 2}
                         response_info = response[0]
@@ -355,9 +383,12 @@ module CloudI
                     $stderr.puts e.backtrace
                     return
                 rescue StandardError => e
-                    return_null_response = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
+                    if @fatal_exceptions
+                        exit(1)
+                    end
+                    return_null_response = true
                 rescue SystemExit => e
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
@@ -373,7 +404,7 @@ module CloudI
                 end
                 begin
                     return_sync(name, pattern, response_info, response,
-                                timeout, trans_id, pid)
+                                timeout, trans_id, source)
                 rescue ReturnSyncException
                 end
             else
@@ -401,12 +432,13 @@ module CloudI
                         raise TerminateException.new(@timeout_terminate)
                     end
                 when MESSAGE_REINIT
-                    i += j; j = 4 + 4 + 4 + 1
-                    tmp = data[i, j].unpack("LLLc")
+                    i += j; j = 4 + 4 + 4 + 1 + 1
+                    tmp = data[i, j].unpack("LLLcC")
                     @process_count = tmp[0]
                     @timeout_async = tmp[1]
                     @timeout_sync = tmp[2]
                     @priority_default = tmp[3]
+                    @fatal_exceptions = tmp[4]
                     i += j
                 when MESSAGE_KEEPALIVE
                     send(Erlang.term_to_binary(:keepalive))
@@ -471,14 +503,19 @@ module CloudI
                     @process_count_max = tmp[2]
                     @process_count_min = tmp[3]
                     prefix_size = tmp[4]
-                    i += j; j = prefix_size + 4 + 4 + 4 + 4 + 1
-                    tmp = data[i, j].unpack("Z#{prefix_size}LLLLc")
+                    i += j; j = prefix_size + 4 + 4 + 4 + 4 + 1 + 1 + 4
+                    tmp = data[i, j].unpack("Z#{prefix_size}LLLLcCl")
                     @prefix = tmp[0]
                     @timeout_initialize = tmp[1]
                     @timeout_async = tmp[2]
                     @timeout_sync = tmp[3]
                     @timeout_terminate = tmp[4]
                     @priority_default = tmp[5]
+                    @fatal_exceptions = tmp[6]
+                    bind = tmp[7]
+                    if bind >= 0 then
+                        raise InvalidInputException
+                    end
                     i += j
                     if i != data_size
                         API.assert{external == false}
@@ -506,9 +543,9 @@ module CloudI
                     request_timeout = tmp[1]
                     priority = tmp[2]
                     trans_id = tmp[3]
-                    pid_size = tmp[4]
-                    i += j; j = pid_size
-                    pid = data[i, j]
+                    source_size = tmp[4]
+                    i += j; j = source_size
+                    source = data[i, j]
                     i += j
                     if i != data_size
                         API.assert{external == true}
@@ -519,7 +556,7 @@ module CloudI
                     data.clear()
                     callback(command, name, pattern, request_info, request,
                              request_timeout, priority, trans_id,
-                             Erlang.binary_to_term(pid))
+                             Erlang.binary_to_term(source))
                     if @terminate
                         return false
                     end
@@ -575,12 +612,13 @@ module CloudI
                     end
                     API.assert{false}
                 when MESSAGE_REINIT
-                    i += j; j = 4 + 4 + 4 + 1
-                    tmp = data[i, j].unpack("LLLc")
+                    i += j; j = 4 + 4 + 4 + 1 + 1
+                    tmp = data[i, j].unpack("LLLcC")
                     @process_count = tmp[0]
                     @timeout_async = tmp[1]
                     @timeout_sync = tmp[2]
                     @priority_default = tmp[3]
+                    @fatal_exceptions = tmp[4]
                     i += j; j = 4
                     if i == data_size
                         data.clear()
@@ -765,6 +803,14 @@ module CloudI
         def self.getenv(key)
             ENV[key] or raise InvalidInputException
         end
+
+        def self.getenv_to_uint(name)
+            value = API.getenv(name).to_i
+            if value < 0 then
+                raise InvalidInputException
+            end
+            return value
+        end
     end
 
     class InvalidInputException < Exception

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudi
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Michael Truog
@@ -11,30 +11,30 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIESDCCArCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDDBxtanRy
-  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
+  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
   -----END CERTIFICATE-----
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erlang_rb
@@ -45,7 +45,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: erlang_rb
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +65,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
 description: Ruby CloudI API
 email: mjtruog@protonmail.com
 executables: []