usbunfreeze_daemon 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e4c5c45b9aa5fd47c8c9cd5d5a4df110913adba
-  data.tar.gz: e63f633f649f3b86d60cdf7595e0233b20e9a3c0
+  metadata.gz: bb3922050856fde416418880302b163f39d69388
+  data.tar.gz: a9826eeafece63eea9a0f193167352bdfc2fe298
 SHA512:
-  metadata.gz: 039745ae78aebe819023cf385c59e1fb988ab976a5a9624d260249358d4f0daa256416f3faab7b6612a53bd6dd92f0e27cd03021065f01ed6746a7cf0ce11685
-  data.tar.gz: 86dc374f1043f47521f7a178826d0da19cd687e587cf897a67eee12eb60a080662a62cbcbd13e6254cdf52000ce0b0e1561dba1da9a3b70080b67537b26ccf9e
+  metadata.gz: 0b85d0be43b8ae9a426886a52bb9dcf41ed1b7739a2cf632316389f8869cbdba1df91afb79466dd13f5b7f58309ae34ab0589f691d6de64d519f5fef77a48052
+  data.tar.gz: c84e9549e4162dc140e7d2adf70cecab935af0964f1f20c2897403a4661cc1469367fa87ca669323be804282c0a92ec0a15efb84134b5a863bedff5cab826bf4

data/README.md

@@ -20,10 +20,17 @@ Configure Amazon AWS SQS queue and place access, secret key and queue name to th
 
 Launch a daemon:
 
-    usbunfreeze_daemon -C /path/to/settings.yaml
+    usbunfreeze_daemon -с /path/to/settings.yaml start
 
 Daemon will poll AWS SQS queue and launch specified command when a message will be received.
 
+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
+ * `start|stop|status` -- self-describing control commands
+
 ## License information
 
 Please consult with the LICENSE.txt for license information. It is MIT by the way.

data/bin/usbunfreeze_daemon

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'usbunfreeze_daemon'
 require 'daemons'
 require 'optparse'
+require 'logger'
 
 class Daemon
   def initialize(args)
@@ -11,15 +12,22 @@ class Daemon
       multiple: false,
       log_output: true
     }
+    @logger = Logger.new(STDOUT)
+    @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+
     @server = UsbunfreezeDaemon::Server.new
+    @server.logger = @logger
 
     OptionParser.new do |opts|
       opts.banner = "Usage: usbunfreeze_daemon [options] start|stop|restart|status"
+      opts.on("-c", "--config CONFIG_PATH", String, "Path to settings file") do |s|
+        @server.conf_path = s
+      end
       opts.on("-d", "--directory DIR", String, "Path to daemon PIDs and logs") do |s|
         @options[:dir] = s
       end
-      opts.on("-c", "--config CONFIG_PATH", String, "Path to settings file") do |s|
-        @server.conf_path = s
+      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|
         @options[:ontop] = true
@@ -28,7 +36,7 @@ class Daemon
       begin
         opts.parse(ARGV)
       rescue OptionParser::ParseError => e
-        STDERR.puts e.message, "\n", opts
+        logger.error "Error: #{e.message}\nOpts: #{opts.inspect}"
         exit(-1)
       end
     end.parse!(args)

data/lib/usbunfreeze_daemon/server.rb

@@ -11,32 +11,33 @@ module UsbunfreezeDaemon
   class Server
 
     attr_accessor :conf_path
+    attr_accessor :logger
 
     def run
-      puts "Loading config from #{@conf_path}"
+      @logger.info "Loading config from #{@conf_path}"
       Settings.source @conf_path
 
-      puts "Running with executable=#{Settings.exec_command}"
+      @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)
       raise 'No SQS object' unless sqs
 
-      puts "Get queue '#{Settings.sqs.queue_name}' ..."
+      @logger.info "Get queue '#{Settings.sqs.queue_name}' ..."
       q = sqs.queues.named(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
-      puts "Start polling queue each #{interval} seconds"
+      @logger.info "Start polling queue each #{interval} seconds"
 
       q.poll(:wait_time_seconds => interval) do |m|
         handle_message m
       end
 
     rescue => e
-      STDERR.puts "Error:" + e.message
-      STDERR.puts e.backtrace.map{|s| "\t"+s}.join("\n")
+      @logger.error "Error:" + e.message
+      @logger.error e.backtrace.map{|s| "\t"+s}.join("\n")
       exit 1
     end
 
@@ -45,19 +46,19 @@ module UsbunfreezeDaemon
     # Handle an incoming SQS message
     # Wrong message is not fatal error
     def handle_message m
-      puts "Get a messsage #{m.id}, received at #{Time.now}, sent at #{m.sent_timestamp}"
-      puts "Object body: #{m.body}"
+      @logger.info "Get a messsage #{m.id}, received at #{Time.now}, sent at #{m.sent_timestamp}"
+      @logger.info "Object body: #{m.body}"
       json = JSON.parse(m.body)
       action = json['message'].downcase
       if json['message'].downcase == 'unfreeze'
-        puts "Launching a command"
+        @logger.info "Launching a command"
         system(Settings.exec_command)
-        puts "Command execution code: #{$?}"
+        @logger.info "Command execution code: #{$?}"
       end
     rescue => e
-      puts "Error parsing a message:" + e.message
-      puts e.backtrace.map{|s| "\t"+s}.join("\n")
-      puts "Continuing..."
+      @logger.info "Error parsing a message:" + e.message
+      @logger.info e.backtrace.map{|s| "\t"+s}.join("\n")
+      @logger.info "Continuing..."
     end
 
   end

data/lib/usbunfreeze_daemon/version.rb

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

data/usbunfreeze_daemon.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = UsbunfreezeDaemon::VERSION
   spec.authors       = ["theirix"]
   spec.email         = ["theirix@gmail.com"]
-  spec.summary       = %q{Usbunfreeze server}
-  spec.description   = %q{Usbunfreeze server}
-  spec.homepage      = ""
+  spec.summary       = %q{Usbunfreeze Daemon}
+  spec.description   = %q{Daemon application for Usbunfreeze kit}
+  spec.homepage      = "http://github.com/theirix/usbunfreeze_daemon"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usbunfreeze_daemon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - theirix
@@ -94,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
-description: Usbunfreeze server
+description: Daemon application for Usbunfreeze kit
 email:
 - theirix@gmail.com
 executables:
@@ -113,7 +113,7 @@ files:
 - lib/usbunfreeze_daemon/server.rb
 - lib/usbunfreeze_daemon/version.rb
 - usbunfreeze_daemon.gemspec
-homepage: ''
+homepage: http://github.com/theirix/usbunfreeze_daemon
 licenses:
 - MIT
 metadata: {}
@@ -136,5 +136,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Usbunfreeze server
+summary: Usbunfreeze Daemon
 test_files: []