mode 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739e44d832df7720ca4502cb8720eab57583415b
-  data.tar.gz: 92beab19a19b2b215aab07ec78181a63cd8e074d
+  metadata.gz: 74f1b2ce9baad12179eacc6a688af0cc4c1a63ea
+  data.tar.gz: 3d8f7f5cab8366b0eb3bf454c62e4374ce9fccf3
 SHA512:
-  metadata.gz: c0858dbcab185e74b16db79382763ae3d23d8505bf53dd681fa1d8d5f3336fc76f94fd6c4b36d51b44fd6f9974e55ec09b1ed622ba7771cf1d49bd2d576f4386
-  data.tar.gz: a3acf7a3b6f816bd509a5c207cf5be8368044a33a01ff5e78461aa4fb9f1439ebd80888b4a6159f94b4ee9e1a7f03241246f6fba15a9aa3e7d5a90d0c8ba412b
+  metadata.gz: 1e288584297b41d8e45ce8886b987531dc5aa77650a9dc188426e25c1b1f47727fd7b6c92a378bad2c3df863c6ddf4671eddb5f48e2b3cea55635cd2da158061
+  data.tar.gz: b091fee08b2215bb46ead6ec37c207db6641f53fa4b71b8a59e012f930d998dfb22d438211ded8f4b7997d0c090f98854914a7d25bdc463283ab5cbdc1895cca

data/lib/connect.rb

@@ -6,8 +6,19 @@ require 'mode'
 
 runner = Mode::Connector::Daemon.new(:max_jobs => ARGV[0] || 4)
 
-trap("INT")  { runner.stop }
-trap("HUP")  { runner.stop }
-trap("TERM") { runner.stop }
+trap("INT") do
+  Mode::Logger.instance.info("connect.rb", "Received INT signal, shutting down.")
+  runner.stop
+end
+
+trap("HUP") do
+  Mode::Logger.instance.info("connect.rb", "Received HUP signal, shutting down.")
+  runner.stop
+end
+
+trap("TERM") do
+  Mode::Logger.instance.info("connect.rb", "Received TERM signal, shutting down.")
+  runner.stop
+end
 
 runner.start

data/lib/mode/api/request.rb

@@ -13,8 +13,13 @@ module Mode
         @params = params
       end
 
-      def perform
-        response = http.send(method.to_sym, path, params)
+      def perform(request_opts = {})
+        response = http.send(method.to_sym) do |request|
+          request.url path
+          request.body = params unless params.empty?
+          request.options[:timeout] = request_opts.fetch(:timeout, 30)
+        end
+
         response.success? ? success(response) : error(response)
       end
 
@@ -103,8 +108,8 @@ module Mode
           new(:head, resolve_path(path)).perform
         end
 
-        def get(path)
-          new(:get, resolve_path(path)).perform
+        def get(path, params = {})
+          new(:get, resolve_path(path), params).perform
         end
 
         def post(path, params = {})

data/lib/mode/commands/connect.rb

@@ -51,7 +51,7 @@ module Mode
           raise StandardError.new("Unknown connection error")
         end
       rescue => err
-        raise "Error: Cannot connect to #{data_source.name}. #{err.message}"
+        raise "Cannot connect to #{data_source.name}. #{err.message}"
       end
 
       def configuration

data/lib/mode/connector/data_source.rb

@@ -77,6 +77,10 @@ module Mode
       def mysql?
         ['mysql', 'mysql2', 'jdbc:mysql'].include?(adapter)
       end
+
+      def oracle?
+        ['oracle', 'jdbc:oracle:thin'].include?(adapter)
+      end
       
       private
 
@@ -101,11 +105,14 @@ module Mode
         case adapter
         when 'jdbc:redshift'
           'jdbc:postgresql'
+        # when 'jdbc:oracle:thin'
+        #   jdbc:oracle:thin:scott/tiger@localhost:1521:orcl
         else
           adapter
         end
       end
 
+
       def port_segment
         port.nil? ? nil : ":#{port}"
       end

data/lib/mode/connector/poller.rb

@@ -1,8 +1,8 @@
 module Mode
   module Connector
     class Poller
-      def perform!(&block)
-        messages = Mode::API::Request.get(path)
+      def perform!(options = {}, &block)
+        messages = Mode::API::Request.get(path, options)
 
         if messages.is_a?(Mode::API::Resource)
           messages.embedded('messages').each do |message|

data/lib/mode/connector/scheduler.rb

@@ -33,26 +33,30 @@ module Mode
 
       private
 
+      def available_slots
+        max_jobs - processors.length
+      end
+
       def tick
-        if processors.length < max_jobs
-          scheduler.in(0, :tag => 'processor') { tock }
+        if available_slots > 0
+          poll_messages(:num_messages => available_slots) do |message|
+            scheduler.in(0, :tag => 'processor') { tock(message) }
+          end
         end
       rescue => err
         Mode::Logger.instance.error(
           "Connector::Scheduler", err.message, err.backtrace)
       end
 
-      def tock
-        poll_messages do |message|
-          process_message(message)
-        end
+      def tock(message)
+        process_message(message)
       rescue => err
         Mode::Logger.instance.error(
           "Connector::Scheduler", err.message, err.backtrace)
       end
 
-      def poll_messages(&block)
-        Mode::Connector::Poller.new.perform!(&block)
+      def poll_messages(options = {}, &block)
+        Mode::Connector::Poller.new.perform!(options, &block)
       end
 
       def process_message(message)

data/lib/mode/logger.rb

@@ -44,6 +44,8 @@ module Mode
       level = options[:level] || self.class.default_level
       formatter = options[:formatter] || self.class.default_formatter
 
+      ensure_log_path(path)
+
       @logger = ::Logger.new(path, rotate_freq)
 
       set_log_level(level)
@@ -160,6 +162,10 @@ module Mode
       @logger.formatter = formatter
     end
 
+    def ensure_log_path(path)
+      FileUtils.mkdir_p(File.dirname(path))
+    end
+
     def log_with_formatting(severity, component, message, detail = [])
       mutex.synchronize do
         return unless enabled

data/lib/mode/version.rb

@@ -1,3 +1,3 @@
 module Mode
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/connector/poller_spec.rb

@@ -17,9 +17,10 @@ describe Mode::Connector::Poller do
         'messages' => [{}, {}]
       }
     })
-    Mode::API::Request.should_receive(:get).with(path).and_return(resource)
+    Mode::API::Request.should_receive(:get).with(path,
+      {:num_messages => 5}).and_return(resource)
     
-    poller.perform! do |message|
+    poller.perform!(:num_messages => 5) do |message|
       message.should be_instance_of(Mode::Connector::Message)
     end
   end

data/spec/connector/scheduler_spec.rb

@@ -60,29 +60,29 @@ describe Mode::Connector::Scheduler do
     scheduler = Mode::Connector::Scheduler.new(data_sources)
     
     message = double(:message, :name => 'name', :query => 'SELECT 1')
-    
-    scheduler.should_receive(:poll_messages).and_yield(message)
     scheduler.should_receive(:process_message).with(message).and_return(true)
     
-    scheduler.send(:tock)
+    scheduler.send(:tock, message)
   end
 
   it "catches errors during tocks" do
     scheduler = Mode::Connector::Scheduler.new(data_sources)
 
     message = "Broken tocking!"
-    scheduler.should_receive(:poll_messages).and_raise(StandardError.new(message))
+    scheduler.should_receive(:process_message).and_raise(StandardError.new(message))
 
     Mode::Logger.instance.should_receive(:error)
 
-    scheduler.send(:tock)
+    scheduler.send(:tock, message)
   end
 
   it "polls if there are available threads in the pool" do
     scheduler = Mode::Connector::Scheduler.new(data_sources)
     
+    message = double(:message, :name => 'name', :query => 'SELECT 1')
+    scheduler.should_receive(:poll_messages).and_yield(message)
     scheduler.scheduler.should_receive(:in).and_return(true)
-
+  
     scheduler.send(:tick)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mode
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Mode Analytics
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor