radar-app 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfcce7a0a67d8975a90faf73b59dc307000b0e55
-  data.tar.gz: 01328620e14ea086a6bab6d3d13b62de656abefe
+  metadata.gz: 147df08f16b84c45254f8accad18b34b9b7d51f7
+  data.tar.gz: 6a6a25aa283d0fdd57013266091e494fedc599c4
 SHA512:
-  metadata.gz: cb6d33d4d82a1ca525e3b1e49c6a2e6212e5fbebb0dc3e1f6605967a268ba1adef437bfa61dac3e8d0a7debdf2f7b49ae56562aba540a470fd372b11107adb07
-  data.tar.gz: 3c0557d4fe258a9ad20c3aeece9ce8fef7468fd35ffcb13c0b0bc82379ea3470400e19e7a6e5ca823b4eb50578b4f5aeade1c1e3c81503ae14bb8f4999743ce1
+  metadata.gz: 33958d283b8d2a5fa3f6a2d1618920f0425c6b91d8c72ed84dc5dc77e93a2c4c470ed2efe046a89f1978fefb02cc88b137b125f350644429b4b47d774b9a890b
+  data.tar.gz: 35233077784098839247952548484f0ee9dc33495018a49fba45c74360d0d63595dd5ab02643a39dc9c8db1cdb0df6a625122404754f6ea7bfe9ce89bbfe880f

data/bin/radar-app

@@ -42,9 +42,11 @@ class RadarApp < Thor
   desc 'server', 'Starts the app server'
   method_option :aliases => 's'
   def server
+    require 'radar-app'
     require 'active_support/dependencies'
+    require 'active_support/descendants_tracker'
     ActiveSupport::Dependencies.autoload_paths << './analyzers'
-    require './analyzers_registry'
+    require './config/app.rb'
     Radar::App::Server.start
   end
 

data/lib/radar/app.rb

@@ -1,14 +1,30 @@
 require 'radar/app/version'
 require 'radar/app/core_ext'
+require 'radar/app/logger'
+require 'radar/app/session'
 require 'radar/app/controller'
 require 'radar/app/analyzer_controller'
 require 'radar/app/server'
 
-require 'connection_pool'
 require 'radar-api'
+require 'connection_pool'
+require 'thrift_client'
+require 'active_support/string_inquirer'
 
 module Radar
   module App
+    def self.logger=(logger)
+      @logger = logger
+    end
+
+    def self.logger
+      @logger ||= ::Logger.new(STDERR)
+    end
+
+    def self.env
+      @env ||= ActiveSupport::StringInquirer.new(ENV['RADAR_ENV'] || 'development')
+    end
+
     def self.security_service
       @security_service ||= connection_pool(Radar::API::SecurityService::Client, 9790)
     end
@@ -28,11 +44,12 @@ module Radar
     end
 
     def self.connection(client_class, port)
-      host = ENV['DATA_SERVER_HOST'] || '127.0.0.1'
-      transport = Thrift::BufferedTransport.new(Thrift::Socket.new(host, port))
-      protocol = Thrift::BinaryProtocol.new(transport)
-      transport.open
-      client_class.new(protocol)
+      ThriftClient.new(client_class, "#{host}:#{port}",
+        protocol: Thrift::BinaryProtocolAccelerated, retries: 1, server_retry_period: 0)
+    end
+
+    def self.host
+      ENV['DATA_SERVER_HOST'] || '127.0.0.1'
     end
   end
 end

data/lib/radar/app/analyzer_controller.rb

@@ -2,68 +2,49 @@ module Radar
   module App
     class AnalyzerController
       include Radar::App::Controller
-      attr_reader :sessions
 
-      forward :on_each_month, :on_each_day, :on_finish, :on_cash_flow
+      forward :on_each_month, :on_each_day, :on_finish,
+      :on_cash_flow, :dump, :resume, :result
 
       def initialize
         @sessions = {}
       end
 
       def analyzers
-        handle_error do
-          @@analyzers.values.map { |analyzer_class| analyzer_class.new.config }
-        end
+        registry.values.map { |analyzer_class| Object.const_get(analyzer_class).new.config }
       end
 
-      def self.register_analyzer(analyzer_id, analyzer_class)
-        (@@analyzers ||= {})[analyzer_id] = analyzer_class
+      def self.<<(analyzer_class)
+        registry[analyzer_class.new.config.id] = analyzer_class.name
       end
 
       def create_session(session_id, analyzer_id)
-        handle_error do
-          analyzer = create_fresh_analyzer(@@analyzers[analyzer_id].name)
-          @sessions[session_id] = analyzer
-          analyzer.config
-        end
+        analyzer = create_fresh_analyzer(analyzer_id)
+        @sessions[session_id] = Session.new(analyzer)
+        analyzer.config
       end
 
-      def dump(session_id)
-        handle_error do
-          @sessions[session_id].dump
-        end
-      end
-
-      def resume(session_id, data)
-        handle_error do
-          @sessions[session_id].resume(data)
+      def example_result(session_id)
+        synchronized(session_id) do
+          @sessions[session_id].analyzer.example_result
         end
       end
 
-      def result(session_id)
-        handle_error do
-          @sessions[session_id].result
-        end
-      end
+      protected
 
-      def destroy_session(session_id)
-        handle_error do
-          @sessions.delete(session_id)
+      def create_fresh_analyzer(analyzer_id)
+        if Radar::App.env.development?
+          $class_reloader.execute_if_updated
         end
+        Object.const_get(registry[analyzer_id]).new
       end
 
-      def example_result(session_id)
-        handle_error do
-          @sessions[session_id].example_result
-        end
+      def registry
+        self.class.registry
       end
 
-      protected
-
-      def create_fresh_analyzer(class_name)
-        ActiveSupport::DescendantsTracker.clear
-        ActiveSupport::Dependencies.clear
-        Object.const_get(class_name).new
+      def self.registry
+        (@@registry ||= {})
       end
     end
   end

data/lib/radar/app/controller.rb

@@ -5,6 +5,14 @@ module Radar
     module Controller
       
       extend ActiveSupport::Concern
+      include Radar::App::Logger
+      attr_reader :sessions
+
+      def destroy_session(session_id)
+        synchronized(session_id) do
+          @sessions.delete(session_id)
+        end
+      end
 
       module ClassMethods
 
@@ -13,8 +21,9 @@ module Radar
         def forward(*methods)
           methods.each do |method|
             define_method(method) do |session_id, *args|
-              handle_error do
-                @sessions[session_id].send(method, *args)
+              synchronized(session_id) do
+                logger.debug { "[#{session_id}] #{method}(...)" }
+                @sessions[session_id].analyzer.send(method, *args)
               end
             end
           end
@@ -23,15 +32,10 @@ module Radar
 
       protected
 
-      def handle_error
-        begin
-          yield
-        rescue => e
-          $stderr.puts "#{e.class}: #{e.message}"
-          $stderr.puts e.backtrace
-          $stderr.puts
-        end
+      def synchronized(session_id)
+        @sessions[session_id].mutex.synchronize { yield }
       end
+
     end
   end
 end

data/lib/radar/app/logger.rb

@@ -0,0 +1,9 @@
+module Radar
+  module App
+    module Logger
+      def logger
+        Radar::App.logger
+      end
+    end
+  end
+end

data/lib/radar/app/server.rb

@@ -8,10 +8,9 @@ module Radar
         handler = Radar::App::AnalyzerController.new
         processor = Radar::API::AnalyzerController::Processor.new(handler)
         transport = Thrift::ServerSocket.new(port)
-        transportFactory = Thrift::BufferedTransportFactory.new
-        server = Thrift::ThreadedServer.new(processor, transport)
-        $stderr.puts "Starting server on port #{port}..."
-        server.serve()
+        server = Thrift::NonblockingServer.new(processor, transport, Thrift::FramedTransportFactory.new)
+        $stderr.puts "Starting app on port #{port}..."
+        server.serve
       end
     end
   end

data/lib/radar/app/session.rb

@@ -0,0 +1,9 @@
+module Radar
+  module App
+    class Session < Struct.new(:analyzer)
+      def mutex
+        @mutex ||= Mutex.new
+      end
+    end
+  end
+end

data/lib/radar/app/version.rb

@@ -1,5 +1,5 @@
 module Radar
   module App
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/radar-app.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thin", "1.6.2"
   spec.add_dependency "connection_pool", "~> 2.0"
   spec.add_dependency "activesupport", "~> 4.1"
+  spec.add_dependency "thrift_client", "~> 0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radar-app
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Leonardo Mendonca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: thrift_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: generates and run a radar-app.
 email:
 - leonardo.mendonca@investtools.com.br
@@ -129,7 +143,9 @@ files:
 - lib/radar/app/controller.rb
 - lib/radar/app/core_ext.rb
 - lib/radar/app/core_ext/date.rb
+- lib/radar/app/logger.rb
 - lib/radar/app/server.rb
+- lib/radar/app/session.rb
 - lib/radar/app/version.rb
 - radar-app.gemspec
 - templates/Gemfile