simple_worker 0.0.13 → 0.1.0

data/lib/http_enabled.rb

@@ -3,6 +3,7 @@ require 'active_support'
 require 'net/http'
 require 'base64'
 
+require File.join(File.dirname(__FILE__), 'simple_worker_error')
 
 begin
     require 'digest/hmac'
@@ -86,11 +87,11 @@ module SimpleWorker
                 when Net::HTTPSuccess
                     # puts 'response body=' + res.body
                     ret = res.body
+                when Net::HTTPClientError
+                    raise SimpleWorker::ClientError.new(res.class.name, ActiveSupport::JSON.decode(res.body))
                 else
                     #res.error
-                    puts 'HTTP ERROR: ' + res.class.name
-                    puts res.body
-                    ret = res.body
+                    raise SimpleWorker::ServiceError.new(res.class.name, res.body)
             end
             return ret
         end

data/lib/simple_worker.rb

@@ -1,6 +1,8 @@
 require File.join(File.dirname(__FILE__), 'http_enabled')
 require File.join(File.dirname(__FILE__), 'api_auth')
 require File.join(File.dirname(__FILE__), 'worker')
+require File.join(File.dirname(__FILE__), 'simple_worker_error')
+
 
 module SimpleWorker
 
@@ -9,6 +11,7 @@ module SimpleWorker
         include SimpleWorker::HttpEnabled
 
         def initialize(access_key, secret_key, options={})
+            puts 'Starting SimpleWorker::Service...'
             super(access_key, secret_key, options)
         end
 
@@ -22,7 +25,7 @@ module SimpleWorker
             options = {"code"=>mystring, "class_name"=>class_name}
             response = run_http(@host, @access_key, @secret_key, :post, "code/put", nil, options)
 #            puts "response=" + response
-            return ActiveSupport::JSON.decode(response)
+            parse_response response
         end
 
         #
@@ -36,10 +39,11 @@ module SimpleWorker
             hash_to_send = {}
             hash_to_send["data"] = data
             hash_to_send["class_name"] = class_name
-            puts 'hash_to_send=' + hash_to_send.inspect
-            response = run_http(@host, @access_key, @secret_key, :put, "queue/add", hash_to_send, params)
-            puts "response=" + response
-            return ActiveSupport::JSON.decode(response)
+            if defined?(RAILS_ENV)
+                hash_to_send["rails_env"] = RAILS_ENV
+            end
+#            puts 'hash_to_send=' + hash_to_send.inspect
+            return queue_raw(class_name, hash_to_send)
 
         end
 
@@ -49,7 +53,18 @@ module SimpleWorker
             #            puts 'hash_to_send=' + hash_to_send.inspect
             response = run_http(@host, @access_key, @secret_key, :put, "queue/add", hash_to_send, params)
             #            puts "response=" + response
-            return ActiveSupport::JSON.decode(response)
+
+            parse_response response
+
+        end
+
+        def parse_response(response)
+            begin
+                return ActiveSupport::JSON.decode(response)
+            rescue => ex
+                puts 'response that caused error = ' + response.to_s
+                raise ex
+            end
         end
 
 
@@ -76,7 +91,7 @@ module SimpleWorker
 #            puts 'hash_to_send=' + hash_to_send.inspect
             response = run_http(@host, @access_key, @secret_key, :put, "queue/schedule", hash_to_send, params)
 #            puts "response=" + response
-            return ActiveSupport::JSON.decode(response)
+            parse_response response
         end
 
         #
@@ -93,15 +108,25 @@ module SimpleWorker
 #            puts 'hash_to_send=' + hash_to_send.inspect
             response = run_http(@host, @access_key, @secret_key, :put, "queue/add", hash_to_send, params)
 #            puts "response=" + response
-            return ActiveSupport::JSON.decode(response)
+            parse_response response
         end
 
         def status(task_id)
             data = {"task_id"=>task_id}
             #puts run_http(@access_key, @secret_key, :post, "queue/status", nil, {"task_id"=>@task_id})
-            response = run_http(@host, @access_key, @secret_key, :get, "queue/status", nil, data)
+            response = run_http(@host, @access_key, @secret_key, :get, "task/status", nil, data)
+#            puts "response=" + response
+            parse_response response
+        end
+
+        def log(task_id)
+            data = {"task_id"=>task_id}
+            #puts run_http(@access_key, @secret_key, :post, "queue/status", nil, {"task_id"=>@task_id})
+            response = run_http(@host, @access_key, @secret_key, :get, "task/log", nil, data)
 #            puts "response=" + response
-            return ActiveSupport::JSON.decode(response)
+            ret = parse_response response
+            ret["log"] = Base64.decode64(ret["log"])
+            ret
         end
 
 

data/lib/simple_worker_error.rb

@@ -0,0 +1,22 @@
+module SimpleWorker
+    class ClientError < StandardError
+
+        attr_reader :response_hash
+
+        def initialize(class_name, response_hash)
+            puts 'response-hash=' + response_hash.inspect
+            super("#{class_name} - #{response_hash["msg"]}")
+            @response_hash = response_hash
+        end
+    end
+
+    class ServiceError < StandardError
+        attr_reader :body
+
+        def initialize(class_name, body)
+            super("#{class_name}")
+            @body = body
+
+        end
+    end
+end

data/lib/worker.rb

@@ -2,6 +2,11 @@
 module SimpleWorker
 
     class Base
+
+        def log(str)
+            puts str.to_s
+        end
+
         def set_progress(hash)
             puts 'set_progress: ' + hash.inspect
         end

data/test/scheduled_worker.rb

@@ -0,0 +1,9 @@
+require 'simple_worker'
+
+class ScheduledWorker < SimpleWorker::Base
+
+    def scheduled_run(data=nil)
+        
+    end
+
+end

data/test/simple_worker_tests.rb

@@ -1,46 +1,75 @@
-require 'test/unit'
-require 'yaml'
-require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-
-class SimpleWorkerTests < Test::Unit::TestCase
-
-    def setup
-        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_worker.yml")))
-        #puts @config.inspect
-        @access_key = @config['simple_worker']['access_key']
-        @secret_key = @config['simple_worker']['secret_key']
-    end
-
-    def teardown
-
-    end
-
-    def test_queue
-
-        worker = SimpleWorker::Service.new(@access_key, @secret_key)
-
-        # Upload latest runner code
-        worker.upload(File.join(File.dirname(__FILE__), "./test_runner.rb"), "TestRunner")
-
-        # Add something to queue, get task ID back
-        # Single task
-        response_hash = worker.queue("TestRunner", {"s3_key"=>"single runner", "times"=>10})
-        # task set
-        response_hash = worker.queue("TestRunner", [{"id"=>"local_id", "s3_key"=>"some key", "times"=>4}, {"s3_key"=>"some key2", "times"=>3}, {"s3_key"=>"some key", "times"=>2}])
-
-        # Check status
-        tasks = response_hash["tasks"]
-        while tasks.size > 0
-            tasks.each do |t|
-                status_response = worker.status(t["task_id"])
-                puts 'status for ' + t["task_id"] + ' = ' + status_response["status"]
-                if status_response["status"] == "complete"
-                    tasks.delete(t)
-                end
-            end
-        end
-
-
-    end
-end
-
+require 'test/unit'
+require 'yaml'
+require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+
+class SimpleWorkerTests < Test::Unit::TestCase
+
+    def setup
+        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_worker.yml")))
+        #puts @config.inspect
+        @access_key = @config['simple_worker']['access_key']
+        @secret_key = @config['simple_worker']['secret_key']
+
+        @worker = SimpleWorker::Service.new(@access_key, @secret_key)
+        @worker.host = "http://localhost:3000/api/"
+    end
+
+    def teardown
+
+    end
+
+    def test_queue
+
+
+        # Upload latest runner code
+        @worker.upload(File.join(File.dirname(__FILE__), "./test_runner.rb"), "TestWorker")
+
+        # Add something to queue, get task ID back
+        # Single task
+        response_hash_single = @worker.queue("TestRunner", {"s3_key"=>"single runner", "times"=>10})
+
+        # task set
+        response_hash = @worker.queue("TestRunner", [{"id"=>"local_id", "s3_key"=>"some key", "times"=>4}, {"s3_key"=>"some key2", "times"=>3}, {"s3_key"=>"some key", "times"=>2}])
+#
+        # Check status
+        tasks = response_hash["tasks"]
+        while tasks.size > 0
+            tasks.each do |t|
+                status_response = @worker.status(t["task_id"])
+                puts 'status for ' + t["task_id"] + ' = ' + status_response["status"]
+                if status_response["status"] == "complete" || status_response["status"] == "error" || status_response["status"] == "cancelled"
+                    tasks.delete(t)
+                end
+            end
+        end
+
+        # lets try to get the log now too
+        task_id = response_hash_single["tasks"][0]["task_id"]
+        puts 'task_id=' + task_id
+        puts 'log=' + @worker.log(task_id).inspect
+
+    end
+
+    def test_scheduled
+
+        # Upload latest runner code
+        @worker.upload(File.join(File.dirname(__FILE__), "./scheduled_runner.rb"), "ScheduledWorker")
+
+        start_at = 10.seconds.since
+        #start_at = start_at.gmtime # testing different timezone
+        puts 'start_at =' + start_at.inspect
+        response_hash = @worker.schedule("TestRunner", {"msg"=>"One time test."}, {:start_at=>start_at})
+        puts 'response_hash=' + response_hash.inspect
+
+        start_at = 10.seconds.since
+        response_hash = @worker.schedule("TestRunner", {"msg"=>"Run times test"}, {:start_at=>start_at, :run_every=>30, :run_times=>3})
+        puts 'response_hash=' + response_hash.inspect
+
+        start_at = 10.seconds.since
+        end_at = 2.minutes.since
+        response_hash = @worker.schedule("TestRunner", {"msg"=>"End at test"}, {:start_at=>start_at, :run_every=>30, :end_at=>end_at, :run_times=>20})
+        puts 'response_hash=' + response_hash.inspect
+
+    end
+end
+

data/test/{test_runner.rb → test_worker.rb}

@@ -1,19 +1,20 @@
 require 'simple_worker'
 
-class TestRunner < SimpleWorker::Base
+# Bump for new checksum.
+class TestWorker < SimpleWorker::Base
 
     def run(data=nil)
-        puts 'running the runner for leroy '.upcase + ' with data: ' + data.inspect
+        log 'running the runner for leroy '.upcase + ' with data: ' + data.inspect
         @times = data["times"].to_i
         @times.times do |i|
-            puts 'running at ' + i.to_s
+            log 'running at ' + i.to_s
             sleep 1
             set_progress(:percent=> (i / @times * 100))
         end
     end
 
     def set_complete(params=nil)
-        puts 'SET COMPLETE YAY!' + params[:task_set_id]
+        log 'SET COMPLETE YAY!' + params[:task_set_id]
     end
 
     def progress
@@ -23,7 +24,5 @@ class TestRunner < SimpleWorker::Base
         return 0.0
     end
 
-
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2009-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - lib/api_auth.rb
 - lib/http_enabled.rb
 - lib/simple_worker.rb
+- lib/simple_worker_error.rb
 - lib/worker.rb
 - README.markdown
 has_rdoc: true
@@ -56,5 +57,6 @@ signing_key:
 specification_version: 3
 summary: Classified
 test_files: 
+- test/scheduled_worker.rb
 - test/simple_worker_tests.rb
-- test/test_runner.rb
+- test/test_worker.rb