crabfarm 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1031e279aeab473f8e46469b3f91383a4dffbd70
-  data.tar.gz: f366d36831117570d65b999de947bb5d6af0d0d1
+  metadata.gz: 45541f82668f0910accb44339916af9e37595470
+  data.tar.gz: 99de58252a283fd334a5c1aafc491eec16610c21
 SHA512:
-  metadata.gz: a5e46aeefc0f4fe6c96ad2f5d02ee312c826a5a724e20b9797818ddb4c876245b6e58331a85feaafc48ab7b7f97f38c3dd1fd497705c72020559bf84ee8c22e4
-  data.tar.gz: df9dd5a3874ef38e462d1adfcf8c4ae92bf4b8f7ed0cfda6456d7e3ed6a1ceb2b791e1dd6f89988bec33bdf8d3fa9ef7db86c38515c43ae1de47aa314876063e
+  metadata.gz: 826f03dc142d062f35c2e7a3ff0cf7c56c16127704c95f81d39a14a0b702ea57c4da07250471ad0b9f55b3825ef51312317b7fc8c0aced47e1fb3f395e87c5d4
+  data.tar.gz: 63863c7f0ede26385cdc1993a97433cfb16911edd593d30488ff5569366aaa38654084f22391c4ce6dad47105b8b691947c37af4ab7ecd9146ee24c1fbc63066

data/lib/crabfarm/configuration.rb

@@ -52,7 +52,7 @@ module Crabfarm
         browser_dsl: :surfer,
         output_builder: :hash,
         driver_factory: nil,
-        log_path: 'logs',
+        log_path: nil,
         proxy: nil,
 
         driver: 'phantomjs',

data/lib/crabfarm/engines/safe_state_loop.rb

@@ -95,9 +95,13 @@ module Crabfarm
             @elapsed = Benchmark.measure do
               begin
                 ActiveSupport::Dependencies.clear
+                logger.info "StateLoop: loading state: #{@next_state_name}"
                 @doc = @context.run_state(@next_state_name, @next_state_params).output_as_json
+                logger.info "StateLoop: state loaded successfully: #{@next_state_name}"
                 @error = nil
               rescue Exception => e
+                logger.error "StateLoop: error while loading state: #{@next_state_name}"
+                logger.error e
                 @doc = nil
                 @error = e
               end
@@ -111,6 +115,10 @@ module Crabfarm
           else sleep 0.2 end
         end
       end
+
+      def logger
+        Crabfarm.logger
+      end
     end
   end
 end

data/lib/crabfarm/modes/server.rb

@@ -66,6 +66,8 @@ module Crabfarm
         @@evaluator = Engines::SafeStateLoop.new
         begin
           Support::CustomPuma.run API, _options
+        rescue SystemExit, Interrupt
+          # just finish
         ensure
           @@evaluator.release
         end

data/lib/crabfarm/phantom_runner.rb

@@ -12,14 +12,18 @@ module Crabfarm
 
     def start
       find_available_port
+      Crabfarm.logger.info "Starting phantomjs in port #{@port}"
       @pid = Process.spawn({}, phantomjs_cmd)
       wait_for_server
+      Crabfarm.logger.info "Phantomjs started (PID: #{@pid})"
     end
 
     def stop
       unless @pid.nil?
-        Process.kill("TERM", @pid)
-        Process.wait @pid
+        Crabfarm.logger.info "Stopping phantomjs (PID: #{@pid})"
+        Process.kill "INT", @pid
+        Process.wait @pid, Process::WNOHANG
+        Crabfarm.logger.info "Phantomjs stopped (PID: #{@pid})"
         @pid = nil
       end
     end

data/lib/crabfarm/templates/Crabfile.erb

@@ -1,2 +1,4 @@
 set_browser_dsl :surfer
 set_driver :phantomjs
+
+set_log_path 'logs'

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/crabfarm.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require "forwardable"
 require "active_support/inflector"
 require "selenium-webdriver"
@@ -20,11 +21,20 @@ require "crabfarm/strategies"
 module Crabfarm
 
   @@config = Configuration.new
+  @@logger = nil
 
   def self.config
     @@config
   end
 
+  def self.logger
+    if @@logger.nil?
+      @@logger = Logger.new(@@config.log_path.nil? ? STDOUT : File.join(@@config.log_path, 'crawler.log'))
+      @@logger.level = Logger::INFO
+    end
+    @@logger
+  end
+
   def self.read_crabfile(_path)
     @@config.instance_eval File.read _path
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder