cloudi 1.7.4 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48fe446d206024bcc59ff6dd776e89d4f9fb848f2fc0be74192e00b0287fac52
-  data.tar.gz: dff753295fa74043c66fefe854f826d23b8f5d1ef19664e21683a1bf5e6f9bef
+  metadata.gz: cc66b5b4c55778756084c1ee148acc705cfa1b8d839a7ea8febb9a6004bd0ad2
+  data.tar.gz: 667a4d1757a157fc95b998f2e86bb0684f47d578da9096c5791d7b349715495b
 SHA512:
-  metadata.gz: e2d831d7b2acac404e66567abbe6583b9ee9fe7c6bf3856549a7b5b8d3a51cf909cd2d535f16d4ddaa8af2be10a7f60258f384a8bee3a9ca3e3dffe9864e6c68
-  data.tar.gz: 4f8e135ec07065c6f81c727a81170e27dbe73b232d5ee66a44705d61cd63c14763f36e68ac1edf55302767fd9dc320c81f8b979602755f3e9af65afd68c94742
+  metadata.gz: 719e2a63d056913d4dee29c91a0bafb0d9b9e4de20232f6a56c96e731ba61117114063a893330c844df37b278ed3ef5858a27b76e420538a51bbe68a56f9403b
+  data.tar.gz: 43b9b474e3842568dba81e38944a679db1f84e3e04933b1e07948ea6feca8e5dd70d640a250b7eb0bc3673524dee56c558caec4e26ff258104cb2cc4c2df2d3d

data/lib/cloudi.rb

@@ -4,7 +4,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2011-2017 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2011-2021 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"),
@@ -31,6 +31,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 require 'erlang'
+require 'stringio'
 
 module CloudI
     class API
@@ -56,13 +57,14 @@ module CloudI
                 @s.sync = true
                 @use_header = true
             else
+                $stderr.puts 'CloudI service execution must occur in CloudI'
                 raise InvalidInputException
             end
             @initialization_complete = false
             @terminate = false
             @size = buffer_size_str.to_i
             @callbacks = Hash.new
-            @timeout_terminate = 1000 # TIMEOUT_TERMINATE_MIN
+            @timeout_terminate = 10 # TIMEOUT_TERMINATE_MIN
             send(Erlang.term_to_binary(:init))
             poll_request(nil, false)
         end
@@ -75,6 +77,7 @@ module CloudI
         attr_reader :timeout_async
         attr_reader :timeout_sync
         attr_reader :timeout_terminate
+        attr_reader :priority_default
 
         def self.thread_count
             s = getenv('CLOUDI_API_INIT_THREAD_COUNT')
@@ -181,7 +184,7 @@ module CloudI
                                         OtpErlangBinary.new(request),
                                         timeout, priority,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ForwardAsyncException.new()
+            raise ForwardAsyncException
         end
 
         def forward_sync(name, request_info, request,
@@ -191,7 +194,7 @@ module CloudI
                                         OtpErlangBinary.new(request),
                                         timeout, priority,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ForwardSyncException.new()
+            raise ForwardSyncException
         end
 
         def return_(request_type, name, pattern, response_info, response,
@@ -213,7 +216,7 @@ module CloudI
                                         OtpErlangBinary.new(response),
                                         timeout,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ReturnAsyncException.new()
+            raise ReturnAsyncException
         end
 
         def return_sync(name, pattern, response_info, response,
@@ -223,7 +226,7 @@ module CloudI
                                         OtpErlangBinary.new(response),
                                         timeout,
                                         OtpErlangBinary.new(trans_id), pid]))
-            raise ReturnSyncException.new()
+            raise ReturnSyncException
         end
 
         def recv_async(timeout=nil, trans_id=nil, consume=true)
@@ -253,6 +256,7 @@ module CloudI
                 function = function_queue.shift
                 function_queue.push(function)
             end
+            return_null_response = false
             case command
             when MESSAGE_SEND_ASYNC
                 begin
@@ -272,29 +276,39 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
-                rescue InvalidInputException => e
-                    raise e
                 rescue MessageDecodingException => e
-                    raise e
+                    @terminate = true
+                    return_null_response = true
                 rescue TerminateException => e
-                    raise e
+                    return_null_response = true
                 rescue ReturnAsyncException
                     return
-                rescue ForwardAsyncException
-                    return
                 rescue ReturnSyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
+                    return
+                rescue ForwardAsyncException
                     return
                 rescue ForwardSyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
                     return
+                rescue StandardError => e
+                    return_null_response = true
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                rescue SystemExit => e
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                    raise
                 rescue
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                    exit(1)
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -321,29 +335,39 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
-                rescue InvalidInputException => e
-                    raise e
                 rescue MessageDecodingException => e
-                    raise e
+                    @terminate = true
+                    return_null_response = true
                 rescue TerminateException => e
-                    raise e
+                    return_null_response = true
                 rescue ReturnSyncException
                     return
-                rescue ForwardSyncException
-                    return
                 rescue ReturnAsyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
+                    return
+                rescue ForwardSyncException
                     return
                 rescue ForwardAsyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
                     return
+                rescue StandardError => e
+                    return_null_response = true
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                rescue SystemExit => e
+                    $stderr.puts e.message
+                    $stderr.puts e.backtrace
+                    raise
                 rescue
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                    exit(1)
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -402,7 +426,11 @@ module CloudI
 
         def poll_request(timeout, external)
             if @terminate
-                return false
+                if external
+                    return false
+                else
+                    raise TerminateException.new(@timeout_terminate)
+                end
             elsif external and not @initialization_complete
                 send(Erlang.term_to_binary(:polling))
                 @initialization_complete = true
@@ -492,6 +520,9 @@ module CloudI
                     callback(command, name, pattern, request_info, request,
                              request_timeout, priority, trans_id,
                              Erlang.binary_to_term(pid))
+                    if @terminate
+                        return false
+                    end
                 when MESSAGE_RECV_ASYNC, MESSAGE_RETURN_SYNC
                     i += j; j = 4
                     response_info_size = data[i, j].unpack('L')[0]
@@ -615,35 +646,66 @@ module CloudI
             return poll_request(timeout, true)
         end
 
-        def text_key_value_parse(text)
-            result = {}
-            data = text.split(NULL.chr)
-            (0...(data.length)).step(2).each do |i|
-                value = result[data[i]]
+        def shutdown(reason=nil)
+            if reason.nil?
+                reason = ''
+            end
+            send(Erlang.term_to_binary([:shutdown, reason]))
+        end
+
+        def self.text_pairs_parse(text)
+            pairs = {}
+            text_segments = text.split(NULL.chr)
+            (0...(text_segments.length)).step(2).each do |i|
+                value = pairs[text_segments[i]]
                 if value == nil
-                    result[data[i]] = data[i + 1]
+                    pairs[text_segments[i]] = text_segments[i + 1]
                 elsif value.kind_of?(Array)
-                    value << data[i + 1]
+                    value << text_segments[i + 1]
                 else
-                    result[data[i]] = [value, data[i + 1]]
+                    pairs[text_segments[i]] = [value, text_segments[i + 1]]
                 end
             end
-            return result
+            return pairs
         end
 
-        def info_key_value_parse(message_info)
-            return text_key_value_parse(message_info)
+        def self.text_pairs_new(pairs, response)
+            text_stream = StringIO.new
+            pairs.each do |key, values|
+                if values.kind_of?(String)
+                    text_stream.write "#{key}\0#{values}\0"
+                else
+                    values.each do |value|
+                        text_stream.write "#{key}\0#{value}\0"
+                    end
+                end
+            end
+            text = text_stream.string
+            if response and text == ''
+                return "\0"
+            else
+                return text
+            end
+        end
+
+        def self.info_key_value_parse(info)
+            return text_pairs_parse(info)
+        end
+
+        def self.info_key_value_new(pairs, response = true)
+            return text_pairs_new(pairs, response)
         end
 
         def self.assert
-            raise 'Assertion failed !' unless yield # if $DEBUG
+            raise AssertionError unless yield # if $DEBUG
         end
 
         private :null_response
         private :callback
         private :handle_events
         private :poll_request
-        private :text_key_value_parse
+        private_class_method :text_pairs_parse
+        private_class_method :text_pairs_new
         private
 
         def send(data)
@@ -729,5 +791,11 @@ module CloudI
         end
         attr_reader :timeout
     end
+
+    class AssertionError < Exception
+    end
+
+    class FatalError < Exception
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudi
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 2.0.2
 platform: ruby
 authors:
 - Michael Truog
@@ -10,27 +10,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRAwDgYDVQQDDAdtanRy
-  dW9nMRowGAYKCZImiZPyLGQBGRYKcHJvdG9ubWFpbDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xODA5MTYwNjU2MTJaFw0xOTA5MTYwNjU2MTJaMEMxEDAOBgNVBAMM
-  B21qdHJ1b2cxGjAYBgoJkiaJk/IsZAEZFgpwcm90b25tYWlsMRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+GXgkcMc
-  t35WqRkNgmolpYtITHDVIDt6uRkY8g4YiI6SlYiyZiP4rrsPNn9sulTT6ZEwXhAu
-  OIARkWXUw6i6j1WcIGPbqOTvjNW536K2O37lqyWyH1LMEpIB9F7IzEEklkqJLKma
-  /0flBlrg0JcTATCNBHBA4nA5aavCToA66pDZvKhf2aE4RaXZ51e/XAGp8GD3bI/T
-  JgEynOPwKrLPsZ292/NSiP3djEG2ysW0zQMBbsn8ARzh8rY140iIQrpG51ew6Vf9
-  tk2zKgXbJVdohfsrHW14iQwCNwX7Sm4QEw7FrNkKW2Usqk2btv8AR1qmBDOY8Q3w
-  sTxnkypn9bICfQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUamLQcH0m/CIPCBzBBk93E2bwepswIQYDVR0RBBowGIEWbWp0cnVvZ0Bw
-  cm90b25tYWlsLmNvbTAhBgNVHRIEGjAYgRZtanRydW9nQHByb3Rvbm1haWwuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQB9b2tlihs2MRw5T7vWvrEnfAPNJvyB0VhZ0GI3
-  oiCBkT59olz87Xa0WgVIqUmBnI0RdxU4whOpbJS4FUb0WI5Qi951HZNadYWGCMOB
-  IF4IEeV3wlkqXyqoMUDjGuviWm2y3aApwkBVjU7+eOG5zWTqKbzLm1wBXq0QfkY/
-  4J2hQRnAzsfNLCm7UFupYSzz6zP43IJGoAs710IC0S0uiETWpKZ3YSCKIeGyTA3L
-  7nx8OPNJn/PVnJAT33TvETe6yc/uUU9m/vhmdL3mQY53CPIqmmql4sVaPRhfTMra
-  PR5cELfNRvj5UGOqyo9Pf8nMz4m+4+IpMII8ZWKmeDP4XmhV
+  MIIESDCCArCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDDBxtanRy
+  dW9nL0RDPXByb3Rvbm1haWwvREM9Y29tMB4XDTIxMDUyNzIwNTIwMFoXDTIyMDUy
+  NzIwNTIwMFowJzElMCMGA1UEAwwcbWp0cnVvZy9EQz1wcm90b25tYWlsL0RDPWNv
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMd6XAi81JZcv5AzNqvx
+  7rPXgBArpQVU0zoUCcJ8ZkszXLnaDkyLXZZDWi4tNIZGzkFGzJv2YxQg/ocUzZXF
+  ixcKuCiUF8nvV58DrFxd8ZYvYMk9GDoU95zIu/brrn6KeFP/nd10vtx46hSlGgeE
+  2vzk2pxw8Umml6xwTuximLjVcetas0tIm3kcUAhdWnI7hTgQbPmsGMEtpebpx4Ff
+  RluZWlBVLt0i1mFpG2BxtGXLFxgxzK/syD8ZHBwaraW5k2ENY163TaJUo2NjDpNF
+  0GpcyslZLz0JKKS1RHyuj6fI5cB+7pP/ewbU7ksoMa8zN067gG6Ry75RnKu/Tfzv
+  Ebh3eBwapuvHnPsWZlyqsPBhoFUH2JUknUgtcg1Q2S6CmzyxdyDaU8OugladoDzF
+  hWuqx3Mt2cvo1kIUCmxUFtHDzTWy5MP0LMv2IwvU6bbgzgbDndqAj9OesQYTxQ7L
+  rbMFjq1GW7nQXvU9GEb1WJYr2Aq8qovn/6mxFWjPVIp7gQIDAQABo38wfTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUoFV73/q6KrKCMTCPVy0+jptr
+  25AwIQYDVR0RBBowGIEWbWp0cnVvZ0Bwcm90b25tYWlsLmNvbTAhBgNVHRIEGjAY
+  gRZtanRydW9nQHByb3Rvbm1haWwuY29tMA0GCSqGSIb3DQEBCwUAA4IBgQATTfoe
+  WbWoOclAmsl338LM/RjGpXVi6N9XF01JhgIXJqQocMlc6L8I6hG9288bQ4nYtYHU
+  Zpw1Wy+5nlAtoacG+ngQLnB1k+oLi1PXN//MjcD5N+qyAgZ71StjzH7+cPiEA5aw
+  0CCXPnsZQR892eESnE8Sc6QEc4iwCdIqbwBgQ4tjF6I34odtuAO2Ydp6keE/eqeQ
+  UdATiqZuvgi/n3fgvFD8FgDec8eiM/u3+n30xc+86m2uqiKSf9ueBNZRmNq9umc4
+  qyyl2UpTyk2WqaXXRCLqKF20QlU2lyR2JnPh7+EsrQKmaaPtw+7QwRhERxXza52x
+  lSRl2bAVGGyRLghx/n1K1ZISc9UJERR7tdEz3N4fbKzRxG5Tk0b7HdeGotue9Zt3
+  WH4J2/+Q2b2u3K1U9iGPxyO3BEBz36D/qdddw1eZTdpT6LFrBQNOVS8C/cVRpUlp
+  VOqfJ1qX4PhcbAYvPwmU8NKJ1UDTdEf4+e+JgHk5qLzpjNsiHYEGTN3E7Gw=
   -----END CERTIFICATE-----
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erlang_rb
@@ -38,40 +42,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: erlang_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 2.0.2
 description: Ruby CloudI API
 email: mjtruog@protonmail.com
 executables: []
@@ -100,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CloudI API