gts 0.1.2 → 0.1.3

data/bin/gts

@@ -19,13 +19,18 @@ opt_parser = OptionParser.new do |opt|
       options[:port] = port
   end
 
+  opt.on("-o","--output FILENAME","output file name; if given csv file with captured data is created") do |filename|
+    options[:output_file] = filename
+  end
+
+  opt.on("-l", "--logfile FILENAME", "file for writing logs. If omitted, logs are written to STDOUT.") do |filename|
+    options[:log_file] = filename
+  end
+
   opt.on("-d","--daemon","run in daemon mode?") do
     options[:daemon] = true
   end
 
-  opt.on("-o","--output FILENAME","output file name; if given csv file with captured data is created") do |filename|
-    options[:output_file] = filename
-  end
 
   opt.on("-x","--debug","show debugging information") do
     options[:debug] = true
@@ -40,16 +45,24 @@ end
 
 opt_parser.parse!
 
+if options[:log_file]
+  Gts.set_log_filename options[:log_file]
+end
+
 puts "Starting GTS #{Gts::VERSION} on address #{options[:address]} and port #{options[:port]}"
 if options[:debug]
   Gts.set_log_level :debug
   puts "Debugging level logs enabled!"
 end
+
 puts "Known devices: " + Gts.registered_handlers.map{|k,v| [k] }.join(", ")
 
 Signal.trap("INT")  { Gts::Server.stop! }
 Signal.trap("TERM") { Gts::Server.stop! }
         
 Gts.server = Gts::Server
+if options[:daemon]
+  Gts.daemonize
+end
 Gts.storage = Gts::RedisStorage.new(:host => "0.0.0.0", :port => 6379) # we use just this one so far, TODO should be configurable
 Gts.server.start!(:address => options[:address], :port => options[:port], :output_file => options[:output_file])

data/lib/gts.rb

@@ -1,4 +1,5 @@
 require "logger"
+require "fileutils"
 
 module Gts
 
@@ -35,16 +36,29 @@ module Gts
     begin 
       @@logger
     rescue
-      @@logger = Logger.new(STDOUT)
-      @@logger.datetime_format = "%d.%m.%Y %H:%M:%S"
-      @@logger.formatter = proc do |severity, datetime, progname, msg|
-        "#{datetime} #{severity}: #{msg}\n"
-      end
-      @@logger.level = log_level
+      set_logger
       @@logger
     end
   end
 
+  def self.set_logger
+    @@logger = Logger.new(log_filename)
+    @@logger.datetime_format = "%d.%m.%Y %H:%M:%S"
+    @@logger.formatter = proc do |severity, datetime, progname, msg|
+      "#{datetime} #{severity}: #{msg}\n"
+    end
+    @@logger.level = log_level
+  end
+
+  def self.set_log_filename(filename)
+    @@log_filename = File.expand_path(filename) 
+    FileUtils.touch filename
+  end
+
+  def self.log_filename
+    @@log_filename
+  end
+
   def self.server=(server_instance)
     @@server = server_instance
   end
@@ -61,6 +75,24 @@ module Gts
     @@storage
   end
 
+  def self.daemonize
+    if RUBY_VERSION < "1.9"
+      exit if fork
+      Process.setsid
+      exit if fork
+      Dir.chdir "/" 
+      STDIN.reopen "/dev/null"
+      STDERR.reopen ("/dev/null"), "a" 
+    else
+      orig_stdout = STDOUT.clone
+      Process.daemon
+      STDOUT.reopen orig_stdout
+    end 
+    puts "Running in background with PID #{Process.pid}"
+    STDOUT.reopen ("/dev/null"), "a"
+    set_logger # reopen logger, just to make sure
+  end
+
 end
 
 require "gts/version"

data/lib/gts/abstract_gps_tracker_handler.rb

@@ -2,7 +2,8 @@ module Gts
 
   class AbstractGPSTrackerHandler
 
-    class CantParseGPSData < StandardError; end
+    class GtsError < StandardError; end
+    class CantParseGPSData < GtsError; end
 
     def self.register!
       Gts.register_handler(self)

data/lib/gts/command_parser.rb

@@ -16,7 +16,7 @@ module Gts
     # uptime
     def parse(str)
       command, *@args = str.split(/\s+/)
-      @command = command.to_sym
+      @command = command.to_s.to_sym
       [@command, @args]
     end
 

data/lib/gts/commands/dump_command.rb

@@ -8,7 +8,12 @@ module Gts
     Gts::Command.register :dump, self, "Dumps captured GPS data from tracking devices into json"
 
     def execute
-      Gts.storage.dump.map{|l| JSON.parse(l) }.to_json
+      dump = Gts.storage.dump
+      if dump
+        dump.map{|l| JSON.parse(l) }.to_json
+      else
+        [].to_json
+      end
     end
 
   end

data/lib/gts/version.rb

@@ -1,3 +1,3 @@
 module Gts
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gts
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors: