mamiya 0.0.1.alpha18 → 0.0.1.alpha19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db58a4aec3a8f7f2929cd2664c6e303f902bb9c
-  data.tar.gz: e37776e176631e187e95a8b6b2775d33180a8ac3
+  metadata.gz: 37666b908bc503abe07629a7308eeb762be79cf7
+  data.tar.gz: aef8d218df47dcdb03e5ff069d7e3a5c4a78a13b
 SHA512:
-  metadata.gz: 7f2675131a259a228697439db198a6394b6e0c9b4fd8d7934c98cc2c47a32e40ebfe67eba878dd1ded48ef299351ba6a6bec9aa17252081847539256082ff265
-  data.tar.gz: fb8a0ffb6701073386fcd62a22de3f5d5f7140c420ce0eced26c270037dc141ba5f8b94e1bcf2d214963b1fea25cfd3d5c7b01c90de6696217975c485411b067
+  metadata.gz: ada7d2968785edd0b9b1f51dfa53d4d8da428ca87f3e85562d05a0505553fe16b303e60d07d6478e090ff7183996a4dcc16322ac21f70038f61e181dd7d31efa
+  data.tar.gz: 044f922700e0f5d873058564b263108ef3ee7350084a5561e17550c205f45b37526ef0e1b347ad3788bb51ba080db71e1b32814b2708310e33c9e9b23367f913

data/lib/mamiya/agent.rb

@@ -119,11 +119,11 @@ module Mamiya
       ]
     end
 
-    def trigger(type, action: nil, **payload)
+    def trigger(type, action: nil, coalesce: true, **payload)
       name = "mamiya:#{type}"
       name << ":#{action}" if action
 
-      serf.event(name, payload.to_json)
+      serf.event(name, payload.to_json, coalesce: coalesce)
     end
 
     private
@@ -190,12 +190,10 @@ module Mamiya
     end
 
     def cleanup_handler(app, package)
-      serf.event(FETCH_REMOVE_EVENT,
-        {
-          name: self.serf.name,
-          application: app,
-          package: package,
-        }.to_json
+      trigger('fetch-result', action: 'remove', coalesce: false,
+        name: self.serf.name,
+        application: app,
+        package: package,
       )
     end
   end

data/lib/mamiya/agent/actions.rb

@@ -1,10 +1,12 @@
 module Mamiya
   class Agent
     module Actions
+      # XXX: dupe?
       def distribute(application, package)
         trigger('fetch',
           application: application,
           package: package,
+          coalesce: false
         )
       end
     end

data/lib/mamiya/agent/handlers/fetch.rb

@@ -15,13 +15,15 @@ module Mamiya
         ].freeze
 
         def run!
+          # XXX: Why don't use agent#trigger ...
           agent.serf.event(FETCH_ACK_EVENT,
             {
               name: agent.serf.name,
               application: payload['application'],
               package: payload['package'],
               pending: agent.fetcher.queue_size.succ,
-            }.to_json
+            }.to_json,
+            coalesce: false,
           )
 
           agent.fetcher.enqueue(
@@ -33,7 +35,8 @@ module Mamiya
                   application: payload['application'],
                   package: payload['package'],
                   pending: agent.fetcher.queue_size.succ,
-                }.to_json
+                }.to_json,
+                coalesce: false,
               )
               agent.update_tags!
             }
@@ -48,7 +51,8 @@ module Mamiya
                     package: payload['package'],
                     error: error.class,
                     pending: agent.fetcher.queue_size,
-                  }.to_json
+                  }.to_json,
+                  coalesce: false,
                 )
               rescue Villein::Client::SerfError => e
                 agent.logger.error "error sending fetch error event: #{e.inspect}"
@@ -60,7 +64,8 @@ module Mamiya
                   application: payload['application'],
                   package: payload['package'],
                   pending: agent.fetcher.queue_size,
-                }.to_json
+                }.to_json,
+                coalesce: false,
               )
             end
 

data/lib/mamiya/master.rb

@@ -38,8 +38,9 @@ module Mamiya
       super
     end
 
+    # XXX: dupe? Mamiya::Agent::Actions#distribute
     def distribute(application, package)
-      trigger(:fetch, application: application, package: package)
+      trigger(:fetch, coalesce: false, application: application, package: package)
     end
 
     def storage(app)

data/lib/mamiya/master/agent_monitor_handlers.rb

@@ -15,6 +15,8 @@ module Mamiya
         status['fetcher'] ||= {}
         status['fetcher']['fetching'] = [payload['application'], payload['package']]
 
+        logger.debug "#{status['name']} started to fetch #{payload['application']}/#{payload['package']}"
+
         status['fetcher']['pending_jobs'] ||= []
         status['fetcher']['pending_jobs'].delete [payload['application'], payload['package']]
       end
@@ -22,6 +24,8 @@ module Mamiya
       def fetch_result__error(status, payload, event)
         status['fetcher'] ||= {}
 
+        logger.error "#{status['name']} failed to fetch #{payload['application']}/#{payload['package']}: #{payload['error']}"
+
         if status['fetcher']['fetching'] == [payload['application'], payload['package']]
           status['fetcher']['fetching'] = nil
         end
@@ -30,6 +34,8 @@ module Mamiya
       def fetch_result__success(status, payload, event)
         status['fetcher'] ||= {}
 
+        logger.info "#{status['name']} fetched #{payload['application']}/#{payload['package']}"
+
         if status['fetcher']['fetching'] == [payload['application'], payload['package']]
           status['fetcher']['fetching'] = nil
         end

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.0.1.alpha18"
+  VERSION = "0.0.1.alpha19"
 end

data/spec/agent/actions_spec.rb

@@ -28,7 +28,8 @@ describe Mamiya::Agent::Actions do
     it "sends fetch request" do
       expect(serf).to receive(:event).with(
         'mamiya:fetch',
-        {application: 'app', package: 'pkg'}.to_json
+        {application: 'app', package: 'pkg'}.to_json,
+        coalesce: false
       )
 
       agent.distribute('app', 'pkg')

data/spec/agent/handlers/fetch_spec.rb

@@ -44,7 +44,9 @@ describe Mamiya::Agent::Handlers::Fetch do
   it "responds ack" do
     allow(fetcher).to receive(:enqueue).with('app', 'package')
     expect(serf).to receive(:event).with('mamiya:fetch-result:ack',
-      {name: serf.name, application: 'app', package: 'package', pending: 1}.to_json)
+      {name: serf.name, application: 'app', package: 'package', pending: 1}.to_json,
+      coalesce: false,
+    )
 
     handler.run!
   end
@@ -62,7 +64,9 @@ describe Mamiya::Agent::Handlers::Fetch do
       options[:before].call
     end
     expect(serf).to receive(:event).with('mamiya:fetch-result:start',
-      {name: serf.name, application: 'app', package: 'package', pending: 1}.to_json)
+      {name: serf.name, application: 'app', package: 'package', pending: 1}.to_json,
+      coalesce: false
+    )
 
     handler.run!
   end
@@ -77,7 +81,8 @@ describe Mamiya::Agent::Handlers::Fetch do
 
     expect(serf).to receive(:event).with(
       'mamiya:fetch-result:success',
-      {name: serf.name, application: 'app', package: 'package', pending: 0}.to_json
+      {name: serf.name, application: 'app', package: 'package', pending: 0}.to_json,
+      coalesce: false
     )
 
     callback.call
@@ -104,6 +109,7 @@ describe Mamiya::Agent::Handlers::Fetch do
           name: serf.name, application: 'app', package: 'package',
           error: error.class, pending: 0,
         }.to_json,
+        coalesce: false,
       )
 
       callback.call(error)

data/spec/agent_spec.rb

@@ -45,6 +45,7 @@ describe Mamiya::Agent do
         {
           name: serf.name, application: 'foo', package: 'bar',
         }.to_json,
+        coalesce: false,
       )
 
       agent.fetcher.cleanup_hook.call('foo', 'bar')

data/spec/master_spec.rb

@@ -50,7 +50,7 @@ describe Mamiya::Master do
     # end
 
     it "triggers fetch event" do
-      expect(master).to receive(:trigger).with(:fetch, application: 'myapp', package: 'mypackage')
+      expect(master).to receive(:trigger).with(:fetch, coalesce: false, application: 'myapp', package: 'mypackage')
 
       master.distribute('myapp', 'mypackage')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha18
+  version: 0.0.1.alpha19
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor