pampa_workers 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69e059adc568b1a74eddf7929d917d867965392c
-  data.tar.gz: 100540adc7fb2e14451c199beb03238275c93da4
+  metadata.gz: ea7a798bc3f03abdb8eb364bc07244f71a9fca3a
+  data.tar.gz: 48785340917afd5e32d8156b42f7c6d2bcbcd612
 SHA512:
-  metadata.gz: 37e419cb21a3557761e6a088db8bcad6d49ce918d02aeb32a7070faf99d371b70a0dc13eb41aa773e189eb4be67f7aa22647501dabf61723f28c67c142fd6583
-  data.tar.gz: 7b00e1be1126b4f8ca316488bfa0ac2f79d6080c90210f45275d5c8f60217d71c3d44826fdedce0d202f17fc17a4815d8bc3fe852630ae283694ebd5ae0bae06
+  metadata.gz: 07a4ae4c26674afb0e6d6ddc2f2f1c6622a4ef3e30fcef8c705f4297ed722e8b0186c30986a5c8f3e632159df99fa830f4e3fc9e23e8aadd164d6c44b9605292
+  data.tar.gz: a1cd15fb0e37875cef2969d8bad8ff21d5b0ce2d5f0197cd4cc6b4deb0e17543f579f33a1068c367cdf5860d19612f9bb30f8f0e3ae3843dafbcd06c85b936ed

data/lib/mybotprocess.rb

@@ -101,7 +101,39 @@ module BlackStack
   
       return lnuser
     end # getLnUser()
+
+    #
+    def notifyInbox(lnuser, conv)
+      conv[:chats].each { |chat|        
+        # armo URL de notificacion
+        # se usa URI.encode para codificar caracteres no-ascii en los mensajes
+        url = 
+          "#{BlackStack::Pampa::api_protocol}://#{self.ws_url}:#{self.ws_port}/api1.3/pampa/scrape.inbox/notify_lnchat.json?" +
+          "api_key=#{BlackStack::Pampa::api_key}&" +
+          "profile_code=#{URI.escape(conv[:profile_code])}&" +
+          "profile_name=#{URI.escape(conv[:profile_name])}&" +
+          "profile_headline=#{URI.escape(conv[:profile_headline])}&" +
+          "first=#{URI.escape(conv[:first])}&" +
+          "position=#{chat[:position].to_s}&" +
+          "uid=#{lnuser['id']}&" +
+          "sender_name=#{URI.escape(chat[:sender_name])}&" +
+          "body=#{URI.escape(chat[:body])}&" 
+puts ""
+puts "url:#{url}:."
+puts ""
+        # HELP: File.open('./output3.txt', 'a') { |file| file.write(url + "\r\n") }
   
+        # push the chat
+        uri = URI.parse(url.to_s)
+        req = Net::HTTP::Get.new(uri.to_s)
+        res = Net::HTTP.start(uri.host, uri.port, :use_ssl => true, :verify_mode => OpenSSL::SSL::VERIFY_NONE) {|http|
+          http.request(req)
+        }
+        parsed = JSON.parse(res.body)
+        raise "error uploading chat: #{parsed['status']}" if parsed['status'] != 'success'
+      } # conv[:chats].each
+    end
+
     #  
     def notifyLnUserUrl(id_lnuser, profile_url)
       nTries = 0
@@ -304,8 +336,9 @@ module BlackStack
       return ret
     end # isLnUserAvailable
   
-    #  
+    # TODO: deprecated
     def releaseLnUser(id_lnuser, workflow_name='incrawl.lnsearchvariation')
+=begin
       nTries = 0
       parsed = nil
       bSuccess = false
@@ -339,6 +372,7 @@ module BlackStack
       end
       
       return ret
+=end
     end # isLnUserAvailable
   
   end # class MyBotProcess

data/lib/worker.rb

@@ -37,6 +37,15 @@ module BlackStack
     # Note that the same worker may has been assigned to different clients withing the same timeframe.
     # This method will compute the seconds used by this client only, over the total timeframe.
     def self.client_usage_ratio(id_client, period='M', units=1)
+      # 
+      row = DB[
+        "select count(*) as total_workers " +
+        "from worker w with (nolock) " +
+        "where w.id_client = '#{id_client}' "
+      ].first
+      t = row[:total_workers].to_f      
+      
+      # 
       row = DB[
         "select datediff(ss, dateadd(#{period}#{period}, -#{units.to_s}, getdate()), getdate()) as total_seconds, isnull(sum(datediff(ss, j.job_start_time, j.job_end_time)), 0) as used_seconds " +
         "from workerjob j with (nolock) " +
@@ -45,9 +54,11 @@ module BlackStack
         "and j.job_start_time is not null " +
         "and j.job_end_time is not null "
       ].first
+      
+      # 
       x = row[:used_seconds].to_f
       y = row[:total_seconds].to_f
-      100.to_f * x / y
+      100.to_f * ( x / t ) / y
     end
 
     # Usage ratio this worker by this client.
@@ -98,6 +109,7 @@ module BlackStack
       w.id_client           = h['id_client']
       w.id_division         = h['id_division']
       w.division_name       = h['division_name']
+      w.public_ip_address   = h['public_ip_address']
       w.save
     end
 
@@ -112,6 +124,7 @@ module BlackStack
       h['id_client'] = self.id_client
       h['id_division'] = self.id_division
       h['division_name'] = self.division_name
+      h['public_ip_address'] = self.public_ip_address
       h
     end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa_workers
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket