pampa_workers 0.0.39 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61203dbeaaf9bf7bfe5b09a4dbb6e429f77b5b06
-  data.tar.gz: 2bdb02fdd44951bb615b49ace98916edb88a80d8
+  metadata.gz: 69e059adc568b1a74eddf7929d917d867965392c
+  data.tar.gz: 100540adc7fb2e14451c199beb03238275c93da4
 SHA512:
-  metadata.gz: 3d9fb77c3ee0f791e60471562337356693168fe69a18fd576dca6e8d66ea4e4a3322a7521de2002d5be08f5ae910a5bc18a41e1aaae4d86ee0207a92f75089de
-  data.tar.gz: 4ea97ca39a260ac62d0ed7ec8562f4b519385a855dbf50da7978df996c85df59b47f0c5e3621022d41f3b00a9a41936b5204b56d2ab586c1b1c6f14572b78930
+  metadata.gz: 37e419cb21a3557761e6a088db8bcad6d49ce918d02aeb32a7070faf99d371b70a0dc13eb41aa773e189eb4be67f7aa22647501dabf61723f28c67c142fd6583
+  data.tar.gz: 7b00e1be1126b4f8ca316488bfa0ac2f79d6080c90210f45275d5c8f60217d71c3d44826fdedce0d202f17fc17a4815d8bc3fe852630ae283694ebd5ae0bae06

data/lib/client.rb

@@ -1,4 +1,3 @@
-require 'invoicing_payments_processing'
 require 'simple_host_monitoring'
 require_relative './user'
 require_relative './role'
@@ -34,62 +33,7 @@ module BlackStack
     def own_hosts()
       BlackStack::LocalHost.where(:id_client=>self.id, :delete_time=>nil)
     end
-  
-    # ----------------------------------------------------------------------------------------- 
-    # Storage:
-    # 
-    # 
-    # ----------------------------------------------------------------------------------------- 
-  
-    # returns the location of the storage for this client
-    def storage_folder
-      "#{BlackStack::Pampa::storage_folder}/#{self.id.to_guid}"
-    end
-  
-    def storage_sub_folder(name)
-      "#{BlackStack::Pampa::storage_folder}/#{self.id.to_guid}/#{name}"
-    end
-  
-    # returns the max allowed KB in the storage for this client
-    def storage_total_kb
-      # TODO: get this parameter from the paid invoces
-      1024*1024 # 1 GB
-    end
-  
-    # returns the max allowed KB in the storage for this client
-    def storage_used_kb
-      path = self.storage_folder
-      fso = WIN32OLE.new('Scripting.FileSystemObject')
-      folder = fso.GetFolder(path)
-      (folder.size.to_f / 1024.to_f) 
-    end
-  
-    # returns the free available KB in the storage for this client
-    def storage_free_kb
-      total = self.storage_total_kb
-      used = self.storage_used_kb
-      total - used
-    end
     
-    # si el cliente no tiene creado el storage, entonces se lo crea, carpeta por carpeta, ferificando cada una si no existe ya.
-    def create_storage
-      folder = self.storage_folder
-      Dir.mkdir BlackStack::Pampa::storage_folder if Dir[BlackStack::Pampa::storage_folder].size==0
-      if Dir[folder].size==0
-        Dir.mkdir folder
-        
-        BlackStack::Pampa::storage_sub_folders.each { |name|
-          s = "#{folder}/#{name}"
-          Dir.mkdir s if Dir[s].size==0        
-        }      
-      end
-    end
-  
-    # retorna la primera division habilitada a la que pertenezca este cliente
-    def division
-      return self.users.first.division
-    end
-  
     # ----------------------------------------------------------------------------------------- 
     # Configuration
     #

data/lib/mybotprocess.rb

@@ -55,14 +55,14 @@ module BlackStack
             sError = parsed['status']
           end
         rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
+          sError = "Errno::ECONNREFUSED:" + e.to_console
         rescue => e2
-          sError = "Exception: " + e2.to_s
+          sError = "Exception: " + e2.to_console
         end
       end # while
   
       if (bSuccess==false)
-        raise "#{sError}"
+        raise BlackStack::Netting::ApiCallException.new(sError)
       end
   
       return lnuser
@@ -89,22 +89,21 @@ module BlackStack
             sError = parsed['status']
           end
         rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
+          sError = "Errno::ECONNREFUSED:" + e.to_console
         rescue => e2
-          sError = "Exception" + e2.to_s
+          sError = "Exception:" + e2.to_console
         end
       end # while
   
       if (bSuccess==false)
-        raise "#{sError}"
+        raise BlackStack::Netting::ApiCallException.new(sError)
       end
   
       return lnuser
     end # getLnUser()
   
     #  
-    def notifyLnUserUrl(id_lnuser, url)
-=begin
+    def notifyLnUserUrl(id_lnuser, profile_url)
       nTries = 0
       parsed = nil
       bSuccess = false
@@ -116,7 +115,7 @@ module BlackStack
           res = BlackStack::Netting::call_post(url,
             {:api_key => BlackStack::Pampa::api_key,
             'id_lnuser' => id_lnuser,
-            'url' => url,}
+            'url' => profile_url,}
           )
           parsed = JSON.parse(res.body)
           
@@ -126,16 +125,15 @@ module BlackStack
             sError = parsed['status']
           end
         rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
+          sError = "Errno::ECONNREFUSED:" + e.to_console
         rescue => e2
-          sError = "Exception" + e2.to_s
+          sError = "Exception:" + e2.to_console
         end
       end # while 
   
       if (bSuccess==false)
         raise "#{sError}"
       end
-=end
     end # notifyLnUserStatus
   
     #  
@@ -161,9 +159,9 @@ module BlackStack
             sError = parsed['status']
           end
         rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
+          sError = "Errno::ECONNREFUSED:" + e.to_console
         rescue => e2
-          sError = "Exception" + e2.to_s
+          sError = "Exception:" + e2.to_console
         end
       end # while 
   
@@ -196,9 +194,9 @@ module BlackStack
             sError = parsed['status']
           end
         rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
+          sError = "Errno::ECONNREFUSED:" + e.to_console
         rescue => e2
-          sError = "Exception" + e2.to_s
+          sError = "Exception:" + e2.to_console
         end
       end # while 
   
@@ -256,9 +254,9 @@ module BlackStack
             sError = parsed['status']
           end
         rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
+          sError = "Errno::ECONNREFUSED:" + e.to_console
         rescue => e2
-          sError = "Exception" + e2.to_s
+          sError = "Exception:" + e2.to_console
         end
       end # while
   
@@ -330,9 +328,9 @@ module BlackStack
             sError = parsed['status']
           end
         rescue Errno::ECONNREFUSED => e
-          sError = "Errno::ECONNREFUSED:" + e.to_s
+          sError = "Errno::ECONNREFUSED:" + e.to_console
         rescue => e2
-          sError = "Exception" + e2.to_s
+          sError = "Exception:" + e2.to_console
         end
       end # while 
   

data/lib/mylocalprocess.rb

@@ -43,13 +43,13 @@ module BlackStack
         w.last_ping_time = now()
         w.name = self.fullWorkerName
         w.assigned_process = self.assigned_process
-        w.id_object = self.id_object
+        w.id_client = self.id_client
         w.division_name = self.division_name
         w.save
       end
       if (w!=nil)
         w.assigned_process = self.assigned_process
-        w.id_object = self.id_object
+        w.id_client = self.id_client
         w.division_name = self.division_name
         w.id_division = self.id_division
         w.save
@@ -65,22 +65,28 @@ module BlackStack
           BlackStack::Pampa::api_protocol, 
           BlackStack::Pampa::api_domain, 
           BlackStack::Pampa::api_port, 
-          BlackStack::Pampa::api_key
+          BlackStack::Pampa::api_key,
+          self.id_client # ID of the client that has this thread assigned
         )
 
         # announcing my in the log
         logger.log "Child process is alive!"
   
         # obtengo los parametros del worker
-        logger.logs "Update from central (1)... "
+        logger.logs "Update from central (1-local)... "
         self.get
         logger.done
   
         # actualizo los datos de este worker (parent process)
-        logger.logs "Update worker (1)... "
+        logger.logs "Update worker (1-local)... "
         self.updateWorker
         logger.done
-  
+
+        # actualizo los datos de este worker (parent process)
+        logger.logs "Switch logger id_client (log folder may change)... "
+        self.logger.id_client = self.id_client
+        logger.done
+
         while (self.canRun?)
           # reseteo en contador nested del logger
           self.logger.reset()
@@ -88,7 +94,7 @@ module BlackStack
           # announcing my in the log
           logger.log "Going to Run Local"
           logger.log "Process: #{self.assigned_process.to_s}."
-          logger.log "Object: #{(self.id_object.to_s.size==0)? 'n/a' : self.id_object.to_s})"
+          logger.log "Client: #{(self.id_client.to_s.size==0)? 'n/a' : self.id_client.to_s}."
   
           # obtengo la hora de inicio
           start_time = Time.now

data/lib/myparentprocess.rb

@@ -12,7 +12,8 @@ module BlackStack
           BlackStack::Pampa::api_protocol, 
           BlackStack::Pampa::api_domain, 
           BlackStack::Pampa::api_port, 
-          BlackStack::Pampa::api_key
+          BlackStack::Pampa::api_key,
+          self.id_client # ID of the client that has this thread assigned
         )
   
         # 
@@ -54,7 +55,7 @@ module BlackStack
                 # map response
                 self.id                 = parsed['id']
                 self.assigned_process   = parsed['assigned_process']
-                self.id_object          = parsed['id_object']
+                self.id_client          = parsed['id_client']
                 self.id_division        = parsed['id_division']
                 self.division_name      = parsed['division_name']
                 self.ws_url             = parsed['ws_url']

data/lib/myprocess.rb

@@ -4,7 +4,7 @@ module BlackStack
     DEFAULT_MINIMUM_ENLAPSED_SECONDS = 60
     
     attr_accessor :assigned_process_changed, :assigned_division_changed, :verify_configuration
-    attr_accessor :logger, :id, :worker_name, :division_name, :minimum_enlapsed_seconds, :assigned_process, :id_object, :id_division, :ws_url, :ws_port
+    attr_accessor :logger, :id, :worker_name, :division_name, :minimum_enlapsed_seconds, :assigned_process, :id_client, :id_division, :ws_url, :ws_port
     attr_accessor :email, :password
   
     # constructor
@@ -100,15 +100,15 @@ module BlackStack
       end
     end # hello()
   
-    # notifico mis parametros (assigned_process, id_object) a la division asignada
-    def set(new_assigned_process, new_id_object)
+    # notifico mis parametros (assigned_process, id_client) a la division asignada
+    def set(new_assigned_process, new_id_client)
       if (self.ws_url.to_s.size > 0 && self.ws_port.to_s.size > 0)
         url = "#{BlackStack::Pampa::api_protocol}://#{self.ws_url.to_s}:#{self.ws_port.to_s}/api1.3/pampa/notify.json"
         res = BlackStack::Netting::call_post(url, {
           'api_key' => BlackStack::Pampa::api_key, 
           'name' => self.fullWorkerName,
           'assigned_process' => new_assigned_process,
-          'id_object' => new_id_object }.merge( BlackStack::RemoteHost.new.poll )
+          'id_client' => new_id_client }.merge( BlackStack::RemoteHost.new.poll )
         )
       end    
     end
@@ -148,18 +148,18 @@ module BlackStack
         end # verify_configuration
               
         # si ya tenia asignada una division, entonces le notifico mi nueva configuracion
-        self.set(parsed['assigned_process'], parsed['id_object'])
+        self.set(parsed['assigned_process'], parsed['id_client'])
   
         self.id                 = parsed['id']
         self.assigned_process   = parsed['assigned_process']
-        self.id_object          = parsed['id_object']
+        self.id_client          = parsed['id_client']
         self.id_division        = parsed['id_division']
         self.division_name      = parsed['division_name']
         self.ws_url             = parsed['ws_url']
         self.ws_port            = parsed['ws_port']      
   
         # le notifico a la nueva division asignada mi nueva configuracion
-        self.set(parsed['assigned_process'], parsed['id_object'])
+        self.set(parsed['assigned_process'], parsed['id_client'])
       end
     end # get()
   
@@ -209,7 +209,8 @@ module BlackStack
         'api_key' => BlackStack::Pampa::api_key, 
         'name' => self.fullWorkerName, 
         'assigned_process' => self.assigned_process,
-        'id_object' => self.id_object }.merge( BlackStack::RemoteHost.new.poll )
+        'id_client' => self.id_client,
+        'id_division' => self.id_division }.merge( BlackStack::RemoteHost.new.poll )
       )
       parsed = JSON.parse(res.body)
       if (parsed['status'] != "success")

data/lib/myremoteprocess.rb

@@ -7,10 +7,11 @@ module BlackStack
     attr_accessor :worker
       
     # update worker configuration in the division
-    def updateWorker()
-      # 
+    def updateWorker()      
+      # creo un remote worker que manejare en este proceso remote
       self.worker = BlackStack::RemoteWorker.new
       # me notifico a la central. obtengo asignacion si ya la tenia
+      # y vuelco la configuracion al remote worker
       url = "#{BlackStack::Pampa::api_url}/api1.3/pampa/get.json"
       res = BlackStack::Netting::call_post(url, {
         'api_key' => BlackStack::Pampa::api_key, 
@@ -20,16 +21,19 @@ module BlackStack
       if (parsed['status'] != BlackStack::Netting::SUCCESS)
         raise parsed['status'].to_s
       else  
-        self.worker.id                 = parsed['id']
-        self.worker.assigned_process   = parsed['assigned_process']
-        self.worker.id_object          = parsed['id_object']
-        self.worker.id_division        = parsed['id_division']
-        self.worker.division_name      = parsed['division_name']
-        self.worker.ws_url             = parsed['ws_url']
-        self.worker.ws_port            = parsed['ws_port']
-        self.worker.division                  = BlackStack::RemoteDivision.new
-        self.worker.division.name             = parsed['division_name']
+        self.worker.id                  = parsed['id']
+        self.worker.assigned_process    = parsed['assigned_process']
+        self.worker.id_client           = parsed['id_client']
+        self.worker.id_division         = parsed['id_division']
+        self.worker.division_name       = parsed['division_name']
+        self.worker.ws_url              = parsed['ws_url']
+        self.worker.ws_port             = parsed['ws_port']
+        self.worker.division            = BlackStack::RemoteDivision.new
+        self.worker.division.name       = parsed['division_name']
       end
+      # llamo al metodo de la clase padre que reporta la configuracion a
+      # la division del worker
+      self.set(parsed['assigned_process'], parsed['id_client'])
     end
   
     # 
@@ -42,20 +46,26 @@ module BlackStack
           BlackStack::Pampa::api_protocol, 
           BlackStack::Pampa::api_domain, 
           BlackStack::Pampa::api_port, 
-          BlackStack::Pampa::api_key
+          BlackStack::Pampa::api_key,
+          self.id_client # ID of the client that has this thread assigned
         )
   
         logger.log "Remote process is alive!"
   
         # actualiza parametros de la central
-        logger.logs "Update from central (1)... "
+        logger.logs "Update from central (1-remote)... "
         self.get
         logger.done
   
         # actualizo los datos de este worker (parent process)
-        logger.logs "Update worker (1)... "
+        logger.logs "Update worker (1-remote)... "
         self.updateWorker
         logger.done
+
+        # actualizo los datos de este worker (parent process)
+        logger.logs "Switch logger id_client (log folder may change)... "
+        self.logger.id_client = self.id_client
+        logger.done
   
         while (self.canRun?)
   
@@ -65,7 +75,7 @@ module BlackStack
           # announcing my in the log
           logger.log "Going to Run Remote"
           logger.log "Process: #{self.assigned_process.to_s}."
-          logger.log "Object: #{(self.id_object.to_s.size==0)? 'n/a' : self.id_object.to_s}."
+          logger.log "Client: #{(self.id_client.to_s.size==0)? 'n/a' : self.id_client.to_s}."
   
           # obtengo la hora de inicio
           start_time = Time.now

data/lib/pampa-local.rb

@@ -29,13 +29,13 @@ def diff(unit, t0, t1)
 end
 
 def before(n) # n minutes
-  DB["SELECT DATEADD(mi, -#{n.to_s}, GETDATE()) AS [now]"].map(:now).to_s[0]
+  DB["SELECT DATEADD(mi, -#{n.to_s}, GETDATE()) AS [now]"].map(:now)[0].to_s[0..22]
 end
 
 def monthsFromNow(n) # n months
-  DB["SELECT DATEADD(mm, +#{n.to_s}, GETDATE()) AS [now]"].map(:now).to_s[0]
+  DB["SELECT DATEADD(mm, +#{n.to_s}, GETDATE()) AS [now]"].map(:now)[0].to_s[0..22]
 end
 
 def daysFromNow(n) # n days
-  DB["SELECT DATEADD(dd, +#{n.to_s}, GETDATE()) AS [now]"].map(:now).to_s[0]
+  DB["SELECT DATEADD(dd, +#{n.to_s}, GETDATE()) AS [now]"].map(:now)[0].to_s[0..22]
 end

data/lib/pampa_workers.rb

@@ -1,6 +1,3 @@
-require 'blackstack_commons'
-require 'simple_command_line_parser'
-require 'simple_cloud_logging'
 require 'simple_host_monitoring'
 require 'socket'
 require 'time'
@@ -11,9 +8,6 @@ require 'openssl'
 require 'tiny_tds'
 require 'sequel'
 
-#require './lib/base'
-#require './config.rb'
-
 require_relative './baseworker'
 require_relative './basedivision'
 
@@ -34,6 +28,8 @@ module BlackStack
   
   module Pampa
 
+    SLEEP_SECONDS = 10
+
     # 
     @@division_name = nil
 
@@ -103,8 +99,8 @@ module BlackStack
     def self.storage_folder()
       @@storage_folder
     end
-    def self.storage_sub_folders(a)
-      @@storage_sub_folder = a
+    def self.storage_sub_folders()
+      @@storage_sub_folders
     end
 
     #

data/lib/remoteworker.rb

@@ -1,7 +1,7 @@
 module BlackStack
 
   class RemoteWorker
-      attr_accessor :id, :process, :last_ping_time, :name, :active, :id_division, :assigned_process, :id_object, :division_name, :ws_url, :ws_port, :division
+      attr_accessor :id, :process, :last_ping_time, :name, :active, :id_division, :assigned_process, :id_client, :division_name, :ws_url, :ws_port, :division
       include BlackStack::BaseWorker
   end # Remote Worker
   

data/lib/worker.rb

@@ -11,147 +11,117 @@ module BlackStack
     BlackStack::Worker.dataset = BlackStack::Worker.dataset.disable_insert_output
     many_to_one :division, :class=>:'BlackStack::Division', :key=>:id_division
     many_to_one :user, :class=>:'BlackStack::User', :key=>:id_user
-=begin
-    # deprecated
-    # Actualiza la la lista de workers que estan asignados esta division
-    def self.updateAllFromCentral()
-      uri = URI("#{WORKER_API_SERVER_URL}/api1.3/pampa/get_all.json")
-      res = Net::HTTP.post_form(uri, {:api_key => BlackStack::Pampa::api_key,})
-      parsed = JSON.parse(res.body)
-      if (parsed['status'] != "success")
-        raise parsed['status'].to_s
-      else
-        parsed['workers'].each { |worker|
-          if ( worker['division_name']!=DATABASE )
-            q = "UPDATE worker SET active=0, division_name='#{worker['division_name']}' WHERE name='#{worker['name']}'"
-            DB.execute(q)
-          else # worker['division_name']==DIVISION_NAME   
-            
-            worker = BlackStack::Worker.where(:name=>worker['name']).first
-            if (worker==nil)
-              worker = BlackStack::Worker.new()
-              worker.id = worker['id']
-              worker.name = worker['name'].to_s
-              worker.last_ping_time = now() # esta fecha es actualiada por el mismo worker, para indicar que esta vivo y trabajando
-              worker.id_division = worker['id_division']
-              worker.process = worker['assigned_process']
-              worker.assigned_process = worker['assigned_process'] 
-              worker.id_object = worker['id_object']
-              worker.division_name = worker['division_name']
-              worker.save()
-            else
-              #puts "update" ?            
-            end
-            
-            DB.execute("UPDATE worker SET active=1 WHERE name='#{worker['name'].to_s}'")
-  
-            if (worker['id_division'] != nil)
-              DB.execute("UPDATE worker SET id_division='#{worker['id_division'].to_s}' WHERE name='#{worker['name'].to_s}'")
-            end
-  
-            if (worker['assigned_process'] != nil)
-              DB.execute("UPDATE worker SET process='#{worker['assigned_process'].to_s}', assigned_process='#{worker['assigned_process'].to_s}' WHERE name='#{worker['name'].to_s}'")
-            end
-  
-            if (worker['id_object'] != nil)
-              DB.execute("UPDATE worker SET id_object='#{worker['id_object'].to_s}' WHERE name='#{worker['name'].to_s}'")
-            end
-  
-            if (worker['division_name'] != nil)
-              DB.execute("UPDATE worker SET division_name='#{worker['division_name'].to_s}' WHERE name='#{worker['name'].to_s}'")
-            end
-  
-            if (worker['type']==nil || worker['type'].to_i==MyProcess::TYPE_LOCAL)
-              DB.execute("UPDATE worker SET type=#{MyProcess::TYPE_LOCAL.to_s} WHERE name='#{worker['name'].to_s}'")
-            else
-              DB.execute("UPDATE worker SET type=#{MyProcess::TYPE_REMOTE.to_s} WHERE name='#{worker['name'].to_s}'")
-            end
-          end
-          
-          # release resources
-          DB.disconnect
-          GC.start
-        }
-        
-      end
+    many_to_one :client, :class=>:'BlackStack::Client', :key=>:id_client
+    many_to_one :owner, :class=>:'BlackStack::Client', :key=>:id_client_owner
+    many_to_one :host, :class=>:'BlackStack::LocalHost', :key=>:id_host
+    many_to_one :current_job, :class=>:'BlackStack::WorkerJob', :key=>:id_workerjob
+    many_to_one :lnuser, :class=>:'BlackStack::LnUser', :key=>:id_lnuser
+    many_to_one :proxy, :class=>:'BlackStack::Proxy', :key=>:id_proxy
+
+    # Usage seconds of all the workers assigned to the client.
+    # Note that the same worker may has been assigned to different clients withing the same timeframe.
+    # This method will sum the seconds used by this client only
+    def self.client_usage_seconds(id_client, period='M', units=1)
+      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) " +
+        "where j.id_client = '#{id_client}' " +
+        "and j.create_time > dateadd(#{period}#{period}, -#{units.to_s}, getdate()) " +
+        "and j.job_start_time is not null " +
+        "and j.job_end_time is not null "
+      ].first
+      row[:used_seconds].to_f
     end
-  
-    # actualiza el rol y objeto asignado a este worker 
-    def updateFromCentral()
-      uri = URI("#{WORKER_API_SERVER_URL}/api1.3/pampa/get.json")
-      res = Net::HTTP.post_form(uri, {'api_key' => BlackStack::Pampa::api_key, 'name' => self.name})
-      parsed = JSON.parse(res.body)
-      if (parsed['status'] != "success")
-        raise parsed['status'].to_s
-      else  
-        # map response
-        self.id_division        = parsed['id_division']
-        self.assigned_process   = parsed['assigned_process']
-        self.id_object          = parsed['id_object']
-        self.division_name      = parsed['division_name']
-        self.active             = true
-  
-        if (parsed['id_object'].to_s.size>0)
-          aux_id_object = "'#{parsed['id_object']}'"
-        else
-          aux_id_object = "NULL"
-        end
-  
-        # NOTA: DEBO HACER EL UPDATE POR FUERA DE SQUEL, DEBIDO AL BUG DE MAPEO DE SEQUEL
-        q =
-        "UPDATE worker SET " +
-        "active=1, id_division='#{parsed['id_division']}', assigned_process='#{parsed['assigned_process'].to_s.gsub("'","''")}', id_object=#{aux_id_object}, division_name='#{parsed['division_name'].to_s.gsub("'","''")}' " +
-        "WHERE id='#{self.id}'"
-        DB.execute(q)      
-      end
+
+    # Average usage ratio of all the workers assigned to the client.
+    # 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 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) " +
+        "where j.id_client = '#{id_client}' " +
+        "and j.create_time > dateadd(#{period}#{period}, -#{units.to_s}, getdate()) " +
+        "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
     end
-  
-    # actualiza el rol y objeto asignado a cada worker asignado a esta division 
-    def self.updateActivesFromCentral()
-      BlackStack::Worker.getActives().each { |worker|
-        worker.updateFromCentral()
-      }
+
+    # Usage ratio this worker by this client.
+    # Note that the same worker may has been assigned to different clients withing the same timeframe.
+    # This method will sum the seconds used by this client only.
+    def usage_seconds(id_client, period='M', units=1)
+      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) " +
+        "where j.id_client = '#{id_client}' " +
+        "and j.id_worker = '#{self.id}' " + 
+        "and j.create_time > dateadd(#{period}#{period}, -#{units.to_s}, getdate()) " +
+        "and j.job_start_time is not null " +
+        "and j.job_end_time is not null "
+      ].first
+      row[:used_seconds].to_f
     end
-=end
-  
+
+    # Usage ratio this worker by this client.
+    # 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 usage_ratio(id_client, period='M', units=1)
+      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) " +
+        "where j.id_client = '#{id_client}' " +
+        "and j.id_worker = '#{self.id}' " + 
+        "and j.create_time > dateadd(#{period}#{period}, -#{units.to_s}, getdate()) " +
+        "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
+    end
+      
     # 
-    def factory(name, params)
-      w = BlackStack::Worker.where(:name=>name).first
-      if (w==nil)
+    def self.create(h)
+      w = BlackStack::Worker.where(:name=>h['name']).first
+      if w.nil?
         w = BlackStack::Worker.new
+        w.id = h['id']
       end
-      w.id                  = parsed['id']
-      w.name                = name
-      w.assigned_process    = parsed['assigned_process']
-      w.id_object           = parsed['id_object']
-      w.id_division         = parsed['id_division']
-      w.division_name       = parsed['division_name']
-      w.ws_url              = parsed['ws_url']
-      w.ws_port             = parsed['ws_port']
+      w.name                = h['name']
+      w.process             = h['process']
+      w.last_ping_time      = h['last_ping_time']
+      w.assigned_process    = h['assigned_process']
+      w.id_client           = h['id_client']
+      w.id_division         = h['id_division']
+      w.division_name       = h['division_name']
       w.save
     end
+
+    # 
+    def to_hash
+      h = {}
+      h['id'] = self.id
+      h['name'] = self.name
+      h['process'] = self.process
+      h['last_ping_time'] = self.last_ping_time
+      h['assigned_process'] = self.assigned_process
+      h['id_client'] = self.id_client
+      h['id_division'] = self.id_division
+      h['division_name'] = self.division_name
+      h
+    end
   
     # Retorna true si este worker esta corriendo en nuestros propios servidores, 
     # Retorna false si este worker esta correiendo en otro host, asumiendo que es el host del cliente.
     # Comparando la pulic_ip_address del worer con la lista en BlackStack::Pampa::set_farm_external_ip_addresses.  
     def hosted?
-      BlackStack::Pampa::set_farm_external_ip_addresses.inlude?(self.public_ip_address)
+      BlackStack::Pampa::farm_external_ip_addresses.include?(self.public_ip_address)
     end # hosted?
-    
-    # Si es un worker hosteado en nuestos servidores (ver metodo hosted?), 
-    # => retorna la cantidad de dias que fa
-    def expirationDesc
-      s = "(unknown)"
-      if self.hosted?
-        if !self.expiration_time.nil?
-          s = DB["SELECT DATEDIFF(mi, GETDATE(), w.expiration_time) AS n FROM worker w WHERE w.id='#{self.id}'"].first[:n].to_i.to_time_spent
-        end 
-      else # no hosted
-        s = "(self-hosted)"
-      end
-      s
-    end 
-  
+      
     # Retorna la cantidad de minutos desde que este worker envio una senial de vida. 
     # Este metodo se usa para saber si un worker esta activo o no.
     def last_ping_minutes()
@@ -163,72 +133,11 @@ module BlackStack
     def active?
       self.last_ping_minutes < BlackStack::BaseWorker::KEEP_ACTIVE_MINUTES
     end
-
-    # escribe en el archivo de log de este worker
-    def log(s, level=1, is_error=false)
-      logw(s, self.process, self.id, level, is_error)
-    end
   
     # envia una senial de vida a la division
-    # TODO: guardar fecha-hora del ultimo ping en un atributo privado, y evitar el acceso escesivo a la base de datos
     def ping()
       DB.execute("UPDATE worker SET last_ping_time=GETDATE() WHERE id='#{self.id}'")
     end
-    
-    # DEPRECATED
-    def self.getActivesCount(processName)
-      raise "Method needs some code inside."
-    end
-  
-    # obtiene array de workers actives, filtrados por proceso y por tipo de worker.
-    def self.getActives(assigned_process_name=nil, worker_name_filter=nil)
-      a = Array.new
-      q = ""
-      if (assigned_process_name!=nil)
-        q =
-            "SELECT p.id AS [id] " +
-            "FROM worker p WITH (NOLOCK INDEX(IX_peer__process__last_ping_time)) " + 
-            "WHERE last_ping_time>DATEADD(mi,-5,GETDATE()) " +
-            "AND ISNULL(active,0)=1 " + # active indica si este worker fue asignado a esta division en la central
-            "AND assigned_process='#{assigned_process_name}' "
-  
-        if worker_name_filter != nil
-          q = q +
-            "AND p.name LIKE '%#{worker_name_filter.to_s}%' "
-        end
-        
-        q = q +
-            "ORDER BY p.name "
-        DB[q].all do |row|
-          a << BlackStack::Worker.where(:id=>row[:id]).first
-        end
-      else
-        q =
-            "SELECT p.id AS [id] " +
-            "FROM worker p WITH (NOLOCK INDEX(IX_peer__process__last_ping_time)) " + 
-            "WHERE last_ping_time>DATEADD(mi,-5,GETDATE()) " +
-            "AND ISNULL(active,0)=1 "
-  
-        if worker_name_filter != nil
-          q = q +
-            "AND p.name LIKE '%#{worker_name_filter.to_s}%' "
-        end
-  
-        q = q +
-            "ORDER BY p.name "
-        DB[q].all do |row|
-          a << BlackStack::Worker.where(:id=>row[:id]).first
-        end
-      end
-      
-      return a
-    end
-  
-    # obtiene cantidad de registros en cola para incrawl.lnsearchvariation
-    def getPendingLnSearchVariationBlockInCrawlCount()
-      return DB.from(:lnsearchvariationblock).where(:incrawl_reservation_id=>self.id, :incrawl_start_time=>nil).count
-    end
-  
   end # class Worker
   
 end # module BlackStack

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa_workers
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 1.1.1
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-08 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -91,47 +91,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.28.0
 - !ruby/object:Gem::Dependency
-  name: blackstack_commons
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.20
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.20
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.20
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.20
-- !ruby/object:Gem::Dependency
-  name: simple_cloud_logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.16
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.16
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.16
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.16
-- !ruby/object:Gem::Dependency
-  name: simple_command_line_parser
+  name: simple_host_monitoring
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -150,26 +110,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: simple_host_monitoring
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.11
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.11
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.11
 description: 'THIS GEM IS STILL IN DEVELOPMENT STAGE. Find documentation here: https://github.com/leandrosardi/pampa.'
 email: leandro.sardi@expandedventure.com
 executables: []