rest-ftp-daemon 0.30.1 → 0.41

data/lib/rest-ftp-daemon/worker_pool.rb

@@ -0,0 +1,63 @@
+module RestFtpDaemon
+  class WorkerPool < RestFtpDaemon::Common
+
+    attr_reader :requested, :processed
+
+    def initialize(number_threads)
+      # Check parameters
+      raise "A thread count of #{number_threads} is less than one" if number_threads < 1
+      @wid = "-"
+
+      # Call super
+      super()
+
+      # Create worker threads
+      number_threads.times do
+        Thread.new { run }
+      end
+    end
+
+    def wait
+      item = @out.pop
+      @lock.synchronize { @processed += 1 }
+      block_given? ? (yield item) : item
+    end
+
+    def progname
+      "WORKER #{@wid}"
+    end
+    #     progname = "Job [#{id}]" unless id.nil?
+    # progname = "Worker [#{id}]" unless worker_id.nil?
+
+    def run
+      # Generate a random key
+      @wid = SecureRandom.hex(2)
+
+      begin
+        loop do
+          info "worker [#{@wid}] waiting for a job... "
+
+          # Wait for a job to come into the queue
+          job = $queue.pop
+          prefix = "working on job [#{job.id}]"
+
+          # Do the job
+          info "job [#{job.id}] processing: #{job.inspect}"
+          job.process
+
+        end
+      rescue Exception => ex
+        info 'WORKER UNHANDLED EXCEPTION: ', ex.message , "\n", ex.backtrace.join("\n")
+      end
+    end
+
+    def process job
+
+      @lock.synchronize do
+        job.dummy
+      end
+
+    end
+
+  end
+end

data/lib/rest-ftp-daemon/www.rb

@@ -0,0 +1,6 @@
+module RestFtpDaemon
+
+  class WWW
+  end
+
+end

data/rest-ftp-daemon.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rest-ftp-daemon/config'
 
 Gem::Specification.new do |spec|
-  spec.name = "rest-ftp-daemon"
+  spec.name = RestFtpDaemon::NAME
   spec.date = Time.now.strftime("%Y-%m-%d")
   spec.authors = ["Bruno MEDICI"]
   spec.email = "rest-ftp-daemon@bmconseil.com"
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 
-  spec.add_runtime_dependency "thin"
+  spec.add_runtime_dependency "thin", "~> 1.6"
   spec.add_runtime_dependency "grape"
   spec.add_runtime_dependency "json"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: '0.41'
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -97,10 +97,18 @@ files:
 - bin/rest-ftp-daemon
 - config.ru
 - lib/rest-ftp-daemon.rb
+- lib/rest-ftp-daemon/api/defaults.rb
+- lib/rest-ftp-daemon/api/jobs.rb
+- lib/rest-ftp-daemon/api/root.rb
+- lib/rest-ftp-daemon/common.rb
 - lib/rest-ftp-daemon/config.rb
 - lib/rest-ftp-daemon/exceptions.rb
 - lib/rest-ftp-daemon/job.rb
-- lib/rest-ftp-daemon/server.rb
+- lib/rest-ftp-daemon/job_queue.rb
+- lib/rest-ftp-daemon/logger.rb
+- lib/rest-ftp-daemon/notification.rb
+- lib/rest-ftp-daemon/worker_pool.rb
+- lib/rest-ftp-daemon/www.rb
 - rest-ftp-daemon.gemspec
 - test/helper.rb
 - test/test_rest-ftp-daemon.rb

data/lib/rest-ftp-daemon/server.rb

@@ -1,237 +0,0 @@
-module RestFtpDaemon
-
-  class API < Grape::API
-    version 'v1', using: :header, vendor: 'ftven'
-    format :json
-
-
-    ######################################################################
-    ####### INIT
-    ######################################################################
-    def initialize
-      # Setup logger
-      @@logger = Logger.new(APP_LOGTO, 'daily')
-      # @@queue = Queue.new
-
-      # Create new thread group
-      @@threads = ThreadGroup.new
-
-      # Other stuff
-      @@last_worker_id = 0
-      super
-    end
-
-    ######################################################################
-    ####### HELPERS
-    ######################################################################
-    helpers do
-      def api_error exception
-        {
-        :error => exception.class,
-        :errmsg => exception.message,
-        :backtrace => exception.backtrace.first,
-        #:backtrace => exception.backtrace,
-        }
-      end
-
-      def info msg=""
-        @@logger.info msg
-      end
-
-      def threads_with_id job_id
-        @@threads.list.select do |thread|
-          next unless thread[:job].is_a? Job
-          thread[:job].id == job_id
-        end
-      end
-
-      def job_describe job_id
-        # Find threads with tihs id
-        threads = threads_with_id job_id
-        raise RestFtpDaemon::JobNotFound if threads.empty?
-
-        # Find first job with tihs id
-        job = threads.first[:job]
-        raise RestFtpDaemon::JobNotFound unless job.is_a? Job
-        description = job.describe
-
-        # Return job description
-        description
-      end
-
-      def job_delete job_id
-        # Find threads with tihs id
-        threads = threads_with_id job_id
-        raise RestFtpDaemon::JobNotFound if threads.empty?
-
-        # Get description just before terminating the job
-        job = threads.first[:job]
-        raise RestFtpDaemon::JobNotFound unless job.is_a? Job
-        description = job.describe
-
-        # Kill those threads
-        threads.each do |t|
-          Thread.kill(t)
-        end
-
-        # Return job description
-        description
-      end
-
-      def job_list
-        @@threads.list.map do |thread|
-          next unless thread[:job].is_a? Job
-          thread[:job].describe
-        end
-      end
-
-    end
-
-
-    ######################################################################
-    ####### API DEFINITION
-    ######################################################################
-
-    # Spawn a new thread for this new job
-    # post '/push' do
-    #   @@queue << rand(999)
-    # end
-
-    # Server global status
-    get '/' do
-      info "GET /"
-
-      status 200
-      {
-        app_name: APP_NAME,
-        hostname: `hostname`.chomp,
-        version: RestFtpDaemon::VERSION,
-        started: APP_STARTED,
-        uptime: (Time.now - APP_STARTED).round(1),
-      }
-    end
-
-    # Server test
-    get '/test' do
-      info "GET /tests"
-      begin
-        raise RestFtpDaemon::DummyException
-      rescue RestFtpDaemon::RestFtpDaemonException => exception
-        status 501
-        api_error exception
-      rescue Exception => exception
-        status 501
-        api_error exception
-      else
-        status 200
-        {}
-      end
-    end
-
-    # List jobs
-    get "/jobs" do
-      info "GET /jobs"
-      begin
-        response = job_list
-      rescue RestFtpDaemonException => exception
-        status 501
-        api_error exception
-      rescue Exception => exception
-        status 501
-        api_error exception
-      else
-        status 200
-        response
-      end
-    end
-
-    # Get job info
-    get "/jobs/:id" do
-      info "GET /jobs/#{params[:id]}"
-      begin
-        response = job_describe params[:id].to_i
-      rescue RestFtpDaemon::JobNotFound => exception
-        status 404
-        api_error exception
-      rescue RestFtpDaemonException => exception
-        status 500
-        api_error exception
-      rescue Exception => exception
-        status 501
-        api_error exception
-      else
-        status 200
-        response
-      end
-    end
-
-    # Delete jobs
-    delete "/jobs/:id" do
-     info "DELETE /jobs/#{params[:name]}"
-      begin
-        response = job_delete params[:id].to_i
-      rescue RestFtpDaemon::JobNotFound => exception
-        status 404
-        api_error exception
-      rescue RestFtpDaemonException => exception
-        status 500
-        api_error exception
-      rescue Exception => exception
-        status 501
-        api_error exception
-      else
-        status 200
-        response
-      end
-    end
-
-    # Spawn a new thread for this new job
-    post '/jobs' do
-      info "POST /jobs: #{request.body.read}"
-      begin
-        # Extract params
-        request.body.rewind
-        params = JSON.parse request.body.read
-
-        # Create a new job
-        job_id = @@last_worker_id += 1
-        job = Job.new(job_id, params)
-
-        # Put it inside a thread
-        th = Thread.new(job) do |thread|
-          # Tnitialize thread
-          Thread.abort_on_exception = true
-          Thread.current[:job] = job
-
-          # Do the job
-          job.process
-
-          # Wait for a few seconds before cleaning up the job
-          job.wander RestFtpDaemon::THREAD_SLEEP_BEFORE_DIE
-        end
-
-        # Stack it to the pool
-        #@@queue << job
-        @@threads.add th
-
-        # And start it asynchronously
-        #job.future.process
-
-      rescue JSON::ParserError => exception
-        status 406
-        api_error exception
-      rescue RestFtpDaemonException => exception
-        status 412
-        api_error exception
-      rescue Exception => exception
-        status 501
-        api_error exception
-      else
-        status 201
-        job.describe
-      end
-    end
-
-  end
-
-end