usbunfreeze_daemon 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 725ed494565429b5bbedd0da8452be558a38db42
-  data.tar.gz: 845b3b9a5e9800dc8d7a417cbfa496a360e9867f
+  metadata.gz: 0b110f278301391a6fc73c50ba0f88892f66e41d
+  data.tar.gz: 1c0b8bef3515d3b0e0daff8be61eca8828a36b7f
 SHA512:
-  metadata.gz: 5478c8605e039f062954c7676dd86173d8eecef35fcc4143e642a85edbad48901c7472e463fecca8e5b47667bc57de72d922efd17063535d5afcd43e64554334
-  data.tar.gz: 2c17a37668e607b7e6c679d030505ad05dca4df165c3dc3ab1d47471780b353a98757dc5b9d382b49b7059537509f1a24c7c96c41288f324e38a3f672c0866d3
+  metadata.gz: 85be19441557cd5a26d3eb2e8367cad894b28572aa54f7e22f4e38decc63b2ac3e0f173245bf9acc86dd0be5c9b80bd42d1c082dabe808563236b9365a20824e
+  data.tar.gz: 9eb83fb83126eca5e9d660b6ef40a4de0db63dd699d4879a4fe841f6e432a50bc386239396ab6bc82063f49439aacb8a2510f96766e57a18e0b96b6e39f2be59

data/README.md

@@ -28,7 +28,7 @@ Possible flags:
 
  * `--directory PATH` -- use `PATH` for logs and pids. Used usually for non-system installation
  * `--system` -- use `/var/log` for logging and `/var/run` for pid storing. `-d` is not needed with this flag.s
- * `--no-daemonize` -- do not fork into daemon
+ * `--ontop` -- do not fork into daemon
  * `start|stop|status` -- self-describing control commands
 
 ## License information

data/bin/usbunfreeze_daemon

@@ -29,14 +29,14 @@ class Daemon
       opts.on("-s", "--system", "Use /var for pids and logs") do |s|
         @options[:dir_mode] = :system
       end
-      opts.on("-n", "--no-daemonize", "Do not daemonize") do |s|
+      opts.on("-t", "--no-daemonize", "Do not daemonize") do |s|
         @options[:ontop] = true
       end
 
       begin
         opts.parse(ARGV)
       rescue OptionParser::ParseError => e
-        logger.error "Error: #{e.message}\nOpts: #{opts.inspect}"
+        @logger.error "Error: #{e.message}\nOpts: #{opts.inspect}"
         exit(-1)
       end
     end.parse!(args)
@@ -50,4 +50,4 @@ class Daemon
   end
 end
 
-Daemon.new(ARGV).run
+Daemon.new(ARGV).run

data/lib/usbunfreeze_daemon/server.rb

@@ -1,6 +1,8 @@
 require 'settingslogic'
 require 'aws-sdk'
 require 'json'
+require 'retries'
+require 'net/http'
 
 module UsbunfreezeDaemon
 
@@ -19,6 +21,24 @@ module UsbunfreezeDaemon
 
       @logger.info "Running with executable=#{Settings.exec_command}"
 
+      handler = Proc.new do |e, attempt_number, total_delay|
+          log_exception "Encountered an error", e
+          @logger.info "Retries attempt #{attempt_number}; #{total_delay} seconds have passed."
+      end
+
+      with_retries(max_tries: 999999, base_sleep_seconds: 5, max_sleep_seconds: 30,
+                   rescue: [SocketError, Seahorse::Client::NetworkingError], handler: handler) do |attempt|
+          @logger.info "Running network loop"
+          run_network
+      end
+
+    rescue StandardError => e
+        log_exception "Error in outer loop", e
+    end
+
+    private
+
+    def run_network
       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)
@@ -41,15 +61,8 @@ module UsbunfreezeDaemon
               @logger.info "Deleting message returned data: #{resp.data}" unless resp.data
           end
       end
-
-    rescue => e
-      @logger.error "Error:" + e.message
-      @logger.error e.backtrace.map{|s| "\t"+s}.join("\n")
-      exit 1
     end
 
-    private
-
     # Handle an incoming SQS message
     # Wrong message is not fatal error
     def handle_message m
@@ -65,10 +78,13 @@ module UsbunfreezeDaemon
         system(Settings.exec_command)
         @logger.info "Command execution code: #{$?}"
       end
-    rescue => e
-      @logger.info "Error parsing a message:" + e.message
-      @logger.info e.backtrace.map{|s| "\t"+s}.join("\n")
-      @logger.info "Continuing..."
+    rescue StandardError => e
+        log_exception "Non-fatal error parsing a message", e
+    end
+
+    def log_exception banner, exception
+      @logger.error "#{banner}: #{exception.message} (class #{exception.class})"
+      @logger.error exception.backtrace.map{|s| "\t"+s}.join("\n")
     end
 
   end

data/lib/usbunfreeze_daemon/version.rb

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

data/usbunfreeze_daemon.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "settingslogic", "~> 2.0.0"
   spec.add_runtime_dependency "aws-sdk", "~> 2"
   spec.add_runtime_dependency "json", "~> 1.8.0"
+  spec.add_runtime_dependency "retries", "~> 0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usbunfreeze_daemon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - theirix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: retries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: Daemon application for Usbunfreeze kit
 email:
 - theirix@gmail.com