sinatra-hexacta 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa4ce2599f3137734dcbc471ecd27592241b1043086c1671d10728d87432025b
-  data.tar.gz: 7cd5851bd3d4e81788256f94c0372afd1dedf4a1cd7f597e4cb04a9bb007e14c
+  metadata.gz: 309f78d43f4e7447e920edaa8e90d36f4992e1cdc0fde8a40ee7ad8f0e17498a
+  data.tar.gz: 66e5d4cceb9b6bf3e1f83919bc2f0962827ef6fba83d459eec4aceea85ac6675
 SHA512:
-  metadata.gz: 4d3c9b32037026c1235d80f0a2abd4bae7883c093fdc05192ed135cf75190ccc08696d1a556a8324db0d9fa38467e1a7c80a86fff3a043d5c80823d656efcfff
-  data.tar.gz: e28adc2053545077db25b8c3b023c9aa4fc5dba671883b0f9fa1379e968972c6a43123336579e07539290efc5e57e8b88594bef2b09f0603147aaa9059e502a3
+  metadata.gz: 8c0c94b820a01db53ae1450f5dd014ca2d1541b6c9f2bb1a0f216e6579b64352ef59bfb2940e405e69a8ae7f19eef4b0f3e434d178a51d75cf3bfe75751b019e
+  data.tar.gz: 3536f3971f4cb17aa0674a496b98d33d2794a0dfe84bf5418ce88b8b4b9e65354d7a7784226b2bf3378cf9de4a775d9f72ef740280b4afc6c0d134c8f5e55e74

data/lib/sinatra/extensions/mailsender.rb

@@ -20,16 +20,32 @@ class MailSender
     http.start { |http| http.request(request) }
   end
 
+
   def _authorize_mail
     params = [ [ "grant_type", "password" ], [ "client_id", "MailApp" ], [ "client_secret", "MailAppPRD2018!" ] ]
-    response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
+    retry_times = 0
+    begin
+      response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
+    rescue StandardError => bang
+      response = nil
+    end
+    until response.is_a?( Net::HTTPSuccess ) || retry_times > 10 do
+      begin
+        retry_times = retry_times + 1
+        sleep(retry_times)
+        response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
+      rescue StandardError => bang
+      end
+    end
     if( response.is_a?( Net::HTTPSuccess ) )
       token = JSON.parse(response.body)
       @access_token = token["access_token"]
       @refresh_token = token["refresh_token"]
       @expire  = DateTime.parse(token[".expires"])
+      return true
     else
       NotificationSender.instance.send_error(nil,'Authorize mail failed',response.body)
+      return false
     end
   end
 
@@ -54,26 +70,34 @@ class MailSender
   end
 
   def _expired?
-    expire.nil? || DateTime.now < expire
+    @expire.nil? || DateTime.now < @expire
   end
 
+
   def do_send(mail)
-    begin
-      if _expired?
-        _authorize_mail
-      end
+    authorized = _expired?? _authorize_mail : true
 
+    if authorized
       params = [ [ "ApplicationCode", 2009 ], [ "Name", mail.template ], [ "Subject", mail.subject ], [ "EmailAddress", mail.from ] ]
       params = params + _build_map_values(mail.values) + _build_to_map(mail.to)
 
-      response = _do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
-
+      retry_times = 0
+      begin
+        response = _do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
+      rescue StandardError => bang
+        response = nil
+      end
+      until response.is_a?( Net::HTTPSuccess ) || retry_times > 10 do
+        begin
+          retry_times = retry_times + 1
+          sleep(retry_times)
+          response = _do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
+        rescue StandardError => bang
+        end
+      end
       if( !response.is_a?( Net::HTTPSuccess ) )
         NotificationSender.instance.send_error(nil,'Send mail failed',response.body)
       end
-    rescue StandardError => error
-      message = error.backtrace.join(',');
-      NotificationSender.instance.send_error(nil,"Mail send error",message)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Marco Zanger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sucker_punch