infopark-politics 0.9.1 → 0.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGZiNDg1MmIzMTVmNzM0NGU5M2JlNDYwYzRjMzIzODllYzE4OTNlNQ==
+    MmIyOTRhYmEzNGNlMzk5NzdiYjFkYjc1MDliM2VhYmM5ODcyZWM1Zg==
   data.tar.gz: !binary |-
-    MjlhZmI1NjQ0YWY3NThkN2FkMTBlNmI0OTFkMTk0YTI2ZTZlZTQwNQ==
+    ZjA5NmU1NTU1ODI5ODBjZjM1OGIwZDZmNzk4Njc2ZGFmODU0NTUyOA==
 SHA512:
   metadata.gz: !binary |-
-    NDIzZTk1OGRjNmU5NTc3MzIwOTY5YWY0OWJhYzRhMjBhYjk0ZWM3OWQ2MTU0
-    MjA4ZWRkMzliY2UzODVhNzIxMjg2OWIzYTZlZDk4NmU2OWY5YzM4YmNkNzk0
-    NDAxN2QzZWU3NDFmYmQzMmQ4ZTIzOGFlZGJkMWFiODZiOWNmOGQ=
+    Y2I3NWIzNDU1Yzk0NzBlODM0NmYxZDFiMzA1YjBhNjA4NDBlMjY1ODgwMGQw
+    Y2E4YWJmNjJjMTU0Njk2MjE3ZTgwYzBjODA4ZGMzNWQ3YmU4MzAzMzY4ZTYw
+    NDM5ZjkzMGY3NzM1ZTY3YWY2OTgzMjU0NzhiMjczMWQ5NjUyMjA=
   data.tar.gz: !binary |-
-    ZjA5NTU1YzAzMTI4ZGM0MDQ0ZGYyY2QwMWMzOGIyODExMGZiNDVjNzNkYWU2
-    Y2NiNTQ3ZTZiNTJmZWQwNGI4MzI0ZmRkN2M4Zjg3NWMxYzFkNDlhMGMzM2U1
-    MTUzZjJhMzExNWU1MjE2ZGMyMjRhYjY2NzhhMjYxZjYwYTA2NDg=
+    ZTUzY2YwMGZiY2I1YTY2YmM1MGQyNzE2NzQ5NmUwZGE1YjRmODY1YTI5NzNh
+    ZmE0ZDgxMGMzOGRhZGY5NGNhMDhmMWZhNzFhMTNjN2NlZDYwNTQ5ZmQ2MzRh
+    OTYxODIzY2YxZTJhNjJlOTljMGVhNDQxZWRmMjg5YmRmNDRkN2Q=

data/infopark-politics.gemspec

@@ -6,7 +6,7 @@ end
 
 Gem::Specification.new do |gem|
   gem.name = "infopark-politics"
-  gem.version = "0.9.1"
+  gem.version = "0.9.2"
   gem.summary = "Algorithms and Tools for Distributed Computing in Ruby."
   gem.description = ""
   gem.authors = ["Mike Perham", "Tilo Prütz"]

data/lib/politics.rb

@@ -1,18 +1,3 @@
 # encoding: utf-8
+require_relative 'politics/logger'
 require_relative 'politics/static_queue_worker'
-
-module Politics
-
-  def self.log=(value)
-    @log = log
-  end
-
-  def self.log
-    @log ||= if defined?(RAILS_DEFAULT_LOGGER)
-      RAILS_DEFAULT_LOGGER
-    else
-      require 'logger'
-      Logger.new(STDOUT)
-    end
-  end
-end

data/lib/politics/logger.rb

@@ -0,0 +1,28 @@
+require 'logger'
+
+class Logger
+  def context(tag)
+    tags.push(tag)
+    yield
+  ensure
+    tags.pop
+  end
+
+  private
+
+  def formatter
+    proc do |severity, datetime, progname, msg|
+      "#{severity[0].upcase}"\
+          " [#{datetime.strftime("%Y-%m-%d %H:%M:%S.%3N")} #{Process.pid}] #{progname}:"\
+          "#{
+            unless tags.empty
+              " [#{tags.join("][")}]"
+            end
+          } #{msg}"
+    end
+  end
+
+  def tags
+    @tags ||= []
+  end
+end

data/lib/politics/static_queue_worker.rb

@@ -56,19 +56,25 @@ module Politics
           if leader?(worker_memcache_client) && !(@leader_thread && @leader_thread.alive?)
             unless (@leader_thread && @leader_thread.alive?)
               @leader_thread = Thread.new do
-                leader_memcache_client = client_for(memcache_config)
-                perform_leader_duties(leader_memcache_client)
+                log.context("leader") do
+                  leader_memcache_client = client_for(memcache_config)
+                  perform_leader_duties(leader_memcache_client)
+                end
               end
             end
           end
 
-          # Get a bucket from the leader and process it
-          begin
-            log.debug "getting bucket request from leader (#{leader_uri(worker_memcache_client)}) and processing it"
-            bucket_process(*leader(worker_memcache_client).bucket_request(uri, bucket_request_context), &block)
-          rescue DRb::DRbError => dre
-            log.error { "Error talking to leader: #{dre.message}" }
-            relax until_next_iteration
+          log.context("worker") do
+            # Get a bucket from the leader and process it
+            begin
+              log.debug "getting bucket request from leader (#{
+                  leader_uri(worker_memcache_client)}) and processing it"
+              bucket_process(*leader(worker_memcache_client).bucket_request(uri,
+                  bucket_request_context), &block)
+            rescue DRb::DRbError => dre
+              log.error { "Error talking to leader: #{dre.message}" }
+              relax until_next_iteration
+            end
           end
         rescue Dalli::DalliError => e
           log.error { "Unexpected DalliError: #{e.message}" }
@@ -133,21 +139,23 @@ module Politics
     end
 
     def bucket_request(requestor_uri, context)
-      memcache_client = client_for(memcache_config)
-      if leader?(memcache_client)
-        log.debug "delivering bucket request"
-        bucket_spec = next_bucket(requestor_uri, context)
-        if !bucket_spec[0] && @followers_to_stop.include?(requestor_uri)
-          # the leader stops its own process and must not be killed by its worker
-          if requestor_uri != uri
-            bucket_spec = [:stop, 0]
+      log.context("drb") do
+        memcache_client = client_for(memcache_config)
+        if leader?(memcache_client)
+          log.debug "delivering bucket request"
+          bucket_spec = next_bucket(requestor_uri, context)
+          if !bucket_spec[0] && @followers_to_stop.include?(requestor_uri)
+            # the leader stops its own process and must not be killed by its worker
+            if requestor_uri != uri
+              bucket_spec = [:stop, 0]
+            end
+            @followers_to_stop.delete(requestor_uri)
           end
-          @followers_to_stop.delete(requestor_uri)
+          bucket_spec
+        else
+          log.debug "received request for bucket but am not leader - delivering :not_leader"
+          [:not_leader, 0]
         end
-        bucket_spec
-      else
-        log.debug "received request for bucket but am not leader - delivering :not_leader"
-        [:not_leader, 0]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark-politics
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Mike Perham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,6 +100,7 @@ files:
 - dcc_config.rb
 - infopark-politics.gemspec
 - lib/politics.rb
+- lib/politics/logger.rb
 - lib/politics/static_queue_worker.rb
 - spec/spec_helper.rb
 - spec/static_queue_worker_spec.rb