bmc-daemon-lib 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 890ecad3eb7c2e42b23f289d50ffd7700d92c3aa
-  data.tar.gz: 42ee986b642385630e0d65f0783502985d970217
+  metadata.gz: 7357ca31777d1e1c08aba18cca42f68f41094dbf
+  data.tar.gz: c39322bb7e140fa19a06697aa7ca5c16945721aa
 SHA512:
-  metadata.gz: 08a925455e322261535e6969b6ad22ef76602a16548434fe05e7b97c95de884456bd8d8713953025be1f91f0d6b3c97e2ba82c39d8e76a5c0f965502f220dab3
-  data.tar.gz: e0930fe378e1c4105a7e22a658d4617c86e99064b9b6578d3dabf73ba7fe3028b48b7fb93b2e1f244724873d945571efc6ec23dfaa2b6aa6f229561b74f7f13a
+  metadata.gz: c9b89de735c85cae26e6d60f51be0d89044fb382cd06ccf9bac18a67126c9f2447490a4ae13c1368aab7656fd835ba39400a9a5b3c998f1f50d73b4becd97e52
+  data.tar.gz: 054ebf6c828545e658cbe275054b8e5eb1722be24a3ede634e4f7d8fb121daa33697038a53522f7081c893710347c0a9e7711ce2c54e0faadda5e5dbd9c87cfa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bmc-daemon-lib (0.7.4)
+    bmc-daemon-lib (0.8.0)
       chamber (~> 2.9.1)
 
 GEM
@@ -11,8 +11,8 @@ GEM
     chamber (2.9.1)
       hashie (~> 3.3)
       thor (~> 0.19.1)
-    diff-lcs (1.2.5)
-    hashie (3.4.6)
+    diff-lcs (1.3)
+    hashie (3.5.1)
     parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -31,7 +31,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.47.0)
+    rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)

data/bmc-daemon-lib.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.7.4"
+  spec.version                      = "0.8.0"
 
   # Project description
   spec.name                         = "bmc-daemon-lib"
@@ -26,8 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency   "rubocop"
   #spec.add_development_dependency   "pry"
 
-
-
   # Runtime dependencies
   spec.add_runtime_dependency       "chamber" , "~> 2.9.1"
 end

data/lib/bmc-daemon-lib.rb

@@ -7,9 +7,12 @@ require "time"
 
 # Project's libs
 require_relative "bmc-daemon-lib/conf"
+
 require_relative "bmc-daemon-lib/logger"
 require_relative "bmc-daemon-lib/logger_helper"
 require_relative "bmc-daemon-lib/logger_pool"
-require_relative "bmc-daemon-lib/worker_base"
+
+require_relative "bmc-daemon-lib/worker"
+
 require_relative "bmc-daemon-lib/mq_endpoint"
 require_relative "bmc-daemon-lib/mq_consumer"

data/lib/bmc-daemon-lib/{worker_base.rb → worker.rb}

@@ -1,7 +1,16 @@
 module BmcDaemonLib
-  class WorkerBase
+  class Worker
     include LoggerHelper
 
+    # Statuses
+    STATUS_STARTING  = "starting"
+    STATUS_READY     = "ready"
+    STATUS_WORKING   = "working"
+    STATUS_SLEEPING  = "sleeping"
+    STATUS_FINISHED  = "finished"
+    STATUS_CRASHED   = "crashed"
+    STATUS_TIMEOUT   = "timeout"
+
     # Class options
     attr_reader :pool
     attr_reader :wid
@@ -18,7 +27,7 @@ module BmcDaemonLib
       Thread.current.thread_variable_set :wid, (@wid = wid)
       Thread.current.thread_variable_set :pool, (@pool = pool)
       Thread.current.thread_variable_set :started_at, Time.now
-      worker_status WORKER_STATUS_STARTING
+      worker_status STATUS_STARTING
 
       # Ask worker to init itself, and return if there are errors
       if worker_init_result = worker_init
@@ -41,15 +50,35 @@ module BmcDaemonLib
     def worker_config
     end
 
+    def worker_sleep seconds
+      return if seconds.nil? || seconds.to_f == 0.0
+      worker_status STATUS_SLEEPING
+      log_info "worker_sleep: #{seconds}", @config
+      sleep seconds
+    end
+
+    def working_on_job(job, working_on_it = false)
+      if working_on_it
+        job.wid = Thread.current.thread_variable_get :wid
+        Thread.current.thread_variable_set :jid, job.id
+      else
+        job.wid = nil
+        Thread.current.thread_variable_set :jid, nil
+      end
+    end
+
     def start_loop
       log_info "start_loop starting", @config
       loop do
         begin
+          # Announce we're waiting for work
+          worker_status STATUS_READY
+
           # Do the hard work
           worker_process
 
-          # Do the cleaning/sleeping stuff
-          worker_after
+          # Should we sleep ?
+          worker_sleep @config[:timer]
 
         rescue StandardError => e
           log_error "WORKER EXCEPTION: #{e.inspect}"
@@ -58,7 +87,7 @@ module BmcDaemonLib
       end
     end
 
-    def worker_status status, job = nil
+    def worker_status status
       # Update thread variables
       Thread.current.thread_variable_set :status, status
       Thread.current.thread_variable_set :updated_at, Time.now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc-daemon-lib
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ files:
 - lib/bmc-daemon-lib/logger_pool.rb
 - lib/bmc-daemon-lib/mq_consumer.rb
 - lib/bmc-daemon-lib/mq_endpoint.rb
-- lib/bmc-daemon-lib/worker_base.rb
+- lib/bmc-daemon-lib/worker.rb
 homepage: http://github.com/bmedici/bmc-daemon-lib
 licenses:
 - MIT