usbunfreeze_daemon 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3922050856fde416418880302b163f39d69388
-  data.tar.gz: a9826eeafece63eea9a0f193167352bdfc2fe298
+  metadata.gz: 725ed494565429b5bbedd0da8452be558a38db42
+  data.tar.gz: 845b3b9a5e9800dc8d7a417cbfa496a360e9867f
 SHA512:
-  metadata.gz: 0b85d0be43b8ae9a426886a52bb9dcf41ed1b7739a2cf632316389f8869cbdba1df91afb79466dd13f5b7f58309ae34ab0589f691d6de64d519f5fef77a48052
-  data.tar.gz: c84e9549e4162dc140e7d2adf70cecab935af0964f1f20c2897403a4661cc1469367fa87ca669323be804282c0a92ec0a15efb84134b5a863bedff5cab826bf4
+  metadata.gz: 5478c8605e039f062954c7676dd86173d8eecef35fcc4143e642a85edbad48901c7472e463fecca8e5b47667bc57de72d922efd17063535d5afcd43e64554334
+  data.tar.gz: 2c17a37668e607b7e6c679d030505ad05dca4df165c3dc3ab1d47471780b353a98757dc5b9d382b49b7059537509f1a24c7c96c41288f324e38a3f672c0866d3

data/config/usbunfreeze.yaml.example

@@ -4,4 +4,5 @@ config:
     queue_name: usbunfreeze_queue
     access_key_id: YOURID
     secret_access_key: YOURKEY
-    interval: 10
+    region: us-east-1
+    interval: 10

data/lib/usbunfreeze_daemon/server.rb

@@ -1,5 +1,5 @@
 require 'settingslogic'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'json'
 
 module UsbunfreezeDaemon
@@ -19,20 +19,27 @@ module UsbunfreezeDaemon
 
       @logger.info "Running with executable=#{Settings.exec_command}"
 
-      sqs = AWS::SQS.new(access_key_id: Settings.sqs.access_key_id,
-      secret_access_key: Settings.sqs.secret_access_key)
+      sqs = Aws::SQS::Client.new(region: Settings.sqs.region,
+                                 access_key_id: Settings.sqs.access_key_id,
+                                 secret_access_key: Settings.sqs.secret_access_key)
       raise 'No SQS object' unless sqs
 
       @logger.info "Get queue '#{Settings.sqs.queue_name}' ..."
-      q = sqs.queues.named(Settings.sqs.queue_name)
+      q = sqs.get_queue_url(queue_name: Settings.sqs.queue_name)
       raise 'Cannot get queue' unless q
-      raise 'Queue does not exist' unless q.exists?
 
-      interval = [Settings.sqs.interval.to_i, AWS::SQS::Queue::DEFAULT_WAIT_TIME_SECONDS].max
+      interval = [Settings.sqs.interval.to_i, 5].max
       @logger.info "Start polling queue each #{interval} seconds"
 
-      q.poll(:wait_time_seconds => interval) do |m|
-        handle_message m
+      while true do
+          sleep interval
+          messages = sqs.receive_message(queue_url: q.data.queue_url, wait_time_seconds: interval)
+          if not messages.messages.empty?
+              m = messages.messages.first
+              handle_message m
+              resp = sqs.delete_message(queue_url: q.data.queue_url, receipt_handle: m.receipt_handle)
+              @logger.info "Deleting message returned data: #{resp.data}" unless resp.data
+          end
       end
 
     rescue => e
@@ -46,11 +53,14 @@ module UsbunfreezeDaemon
     # Handle an incoming SQS message
     # Wrong message is not fatal error
     def handle_message m
-      @logger.info "Get a messsage #{m.id}, received at #{Time.now}, sent at #{m.sent_timestamp}"
+      @logger.info "Get a messsage #{m.message_id}, received at #{Time.now}"
       @logger.info "Object body: #{m.body}"
       json = JSON.parse(m.body)
       action = json['message'].downcase
-      if json['message'].downcase == 'unfreeze'
+      if json['timestamp']
+          @logger.info "Message was sent at #{json['timestamp']}"
+      end
+      if action == 'unfreeze'
         @logger.info "Launching a command"
         system(Settings.exec_command)
         @logger.info "Command execution code: #{$?}"
@@ -63,4 +73,4 @@ module UsbunfreezeDaemon
 
   end
 
-end
+end

data/lib/usbunfreeze_daemon/version.rb

@@ -1,3 +1,3 @@
 module UsbunfreezeDaemon
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/usbunfreeze_daemon.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "daemons", "~> 1.1.0"
   spec.add_runtime_dependency "settingslogic", "~> 2.0.0"
-  spec.add_runtime_dependency "aws-sdk-v1", "~> 1.60.0"
+  spec.add_runtime_dependency "aws-sdk", "~> 2"
   spec.add_runtime_dependency "json", "~> 1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usbunfreeze_daemon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - theirix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement