trusted 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe22de0a36b2b3bc06d99ce763da9541fa65adc8
-  data.tar.gz: 2014461c82af74382935959786d7fb059de8a82c
+  metadata.gz: 2c8dfba7fc9d8141dfdfb8068d0824277ba0ec42
+  data.tar.gz: 4a7d0f63c106ff8c268ba8f7e027e6211c797c03
 SHA512:
-  metadata.gz: 8b5217afe22e37f29b4967f3a0a42309fc57a22b53171a054fb3afaf2eb2fd18afd65542f7f34a38202f30af4d068af5d9078d3e050c741bb0e5f994716a2cbb
-  data.tar.gz: 9b7b02314578c6be323863b20b7841501e9a89638fccf8c24a2b2d04d1331a8a27d6ff57101bf7f813f2bf43e496e81522ee514a9d9e821ae5aec06a5beea855
+  metadata.gz: 8bde46c7b2bed5dbb0510d45666767ee8383f1b78f397ce9bef60b23810af665c4c9b51d49e37b0b534e30173d76222232c78864c0b1281be1927f9a3d3d4c2a
+  data.tar.gz: ab853613b7c5c39965cfa486e734ff433939ef0c44fcaf0508402164a63cac8286322e55604d8ec7d5a3b92b5a4ade9ec03b05a9471a87574b3c8b24385d8fee

data/Rakefile

@@ -1,8 +1,5 @@
 require 'thermite/tasks'
-# require 'bundler/gem_tasks'
-# require 'rspec/core/rake_task'
 
-# RSpec::Core::RakeTask.new(:spec)
 Thermite::Tasks.new(cargo_project_path: 'ext/trusted')
 
 task default: %w(thermite:build)

data/ext/trusted/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trusted"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Dmitry Gritsay <dmitry@vinted.com>"]
 
 [lib]

data/ext/trusted/src/config/config.rs

@@ -7,15 +7,21 @@ use super::BindingType;
 pub struct Config {
     binding_type: BindingType,
     listen_on: String,
-    thread_pool_size: usize,
+    native_thread_pool_size: usize,
+    rack_thread_pool_size: usize,
 }
 
 impl Config {
-    pub fn new(binding_type: BindingType, listen_on: String, thread_pool_size: usize) -> Self {
+    pub fn new(binding_type: BindingType,
+               listen_on: String,
+               native_thread_pool_size: usize,
+               rack_thread_pool_size: usize) -> Self {
+
         Config {
             binding_type: binding_type,
             listen_on: listen_on,
-            thread_pool_size: thread_pool_size,
+            native_thread_pool_size: native_thread_pool_size,
+            rack_thread_pool_size: rack_thread_pool_size,
         }
     }
 
@@ -30,8 +36,13 @@ impl Config {
     }
 
     #[inline]
-    pub fn thread_pool_size(&self) -> usize {
-        self.thread_pool_size
+    pub fn native_thread_pool_size(&self) -> usize {
+        self.native_thread_pool_size
+    }
+
+    #[inline]
+    pub fn rack_thread_pool_size(&self) -> usize {
+        self.rack_thread_pool_size
     }
 }
 
@@ -55,12 +66,19 @@ impl From<RubyConfig> for Config {
         let binding_type = BindingType::from(binding_type.as_str());
 
         // TODO: raise an exception if it is not a Symbol
-        let thread_pool_size =
+        let native_thread_pool_size =
+            ruby_config
+                .send("native_thread_pool_size", vec![])
+                .try_convert_to::<Fixnum>().unwrap()
+                .to_i64() as usize;
+
+        // TODO: raise an exception if it is not a Symbol
+        let rack_thread_pool_size =
             ruby_config
-                .send("thread_pool_size", vec![])
+                .send("rack_thread_pool_size", vec![])
                 .try_convert_to::<Fixnum>().unwrap()
                 .to_i64() as usize;
 
-        Config::new(binding_type, listen_on, thread_pool_size)
+        Config::new(binding_type, listen_on, native_thread_pool_size, rack_thread_pool_size)
     }
 }

data/ext/trusted/src/core/server.rs

@@ -4,7 +4,7 @@ use std::thread;
 
 use hyper::server::Server as HyperServer;
 use hyperlocal::UnixSocketServer;
-use ruru::{Proc, VM};
+use ruru::{Proc, Thread};
 
 use config::{BindingType, Config};
 use core::{Core, Handler, ResponseFuture};
@@ -33,23 +33,25 @@ impl Server {
                                  request_receiver,
                                  ruby_handler,
                                  core_stream,
-                                 self.config.thread_pool_size());
+                                 self.config.rack_thread_pool_size());
 
         thread::spawn(move || {
             let handler_function = || -> () {
                 println!("[hyper] GVL released for server thread");
 
-                let thread_pool_size = self.config.thread_pool_size();
+                let address = self.config.listen_on();
+                let thread_pool_size = self.config.native_thread_pool_size();
 
                 println!("[hyper] Spawning {} native thread(s)", thread_pool_size);
+                println!("[hyper] Listening on {}", address);
 
                 match *self.config.binding_type() {
                     BindingType::Unix => {
-                        UnixSocketServer::new(self.config.listen_on()).unwrap()
+                        UnixSocketServer::new(address).unwrap()
                             .handle_threads(handler, thread_pool_size).unwrap();
                     },
                     BindingType::Tcp => {
-                        HyperServer::http(self.config.listen_on()).unwrap()
+                        HyperServer::http(address).unwrap()
                             .handle_threads(handler, thread_pool_size).unwrap();
                     }
                 };
@@ -59,7 +61,7 @@ impl Server {
                 ()
             };
 
-            VM::thread_call_without_gvl(
+            Thread::call_without_gvl(
                 handler_function,
                 Some(unblock_function)
             );

data/lib/rack/handler/trusted.rb

@@ -10,8 +10,6 @@ module Rack
 
         ::Trusted::Server.new(config).listen do |request, response|
           puts "REQUEST: [#{request.method}] #{request.uri}"
-          puts "PATH_INFO: #{request.path_info}"
-          puts "REQUEST HEADERS: #{request.headers.inspect}"
 
           rack_input = StringIO::new(request.body)
 

data/lib/trusted/config/builder.rb

@@ -6,7 +6,8 @@ module Trusted
       DEFAULT_CONFIG = {
         binding_type: :tcp,
         listen_on: 'localhost:3000',
-        thread_pool_size: 1,
+        rack_thread_pool_size: 1,
+        native_thread_pool_size: 1,
       }.freeze
 
       def self.dsl(&block)
@@ -25,8 +26,12 @@ module Trusted
         config[:listen_on] = address
       end
 
-      def thread_pool_size(size)
-        config[:thread_pool_size] = size
+      def rack_thread_pool_size(size)
+        config[:rack_thread_pool_size] = size
+      end
+
+      def native_thread_pool_size(size)
+        config[:native_thread_pool_size] = size
       end
 
       def build

data/lib/trusted/config/config.rb

@@ -1,12 +1,13 @@
 module Trusted
   module Config
     class Config
-      attr_reader :binding_type, :listen_on, :thread_pool_size
+      attr_reader :binding_type, :listen_on, :rack_thread_pool_size, :native_thread_pool_size
 
       def initialize(configuration)
         @binding_type = configuration[:binding_type]
         @listen_on = configuration[:listen_on]
-        @thread_pool_size = configuration[:thread_pool_size]
+        @rack_thread_pool_size = configuration[:rack_thread_pool_size]
+        @native_thread_pool_size = configuration[:native_thread_pool_size]
       end
     end
   end

data/lib/trusted/version.rb

@@ -1,3 +1,3 @@
 module Trusted
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/trusted.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Dmitry Gritsay']
   spec.email         = ['unseductable@gmail.com']
 
-  spec.summary       = %q{Write a short summary, because Rubygems requires one.}
-  spec.description   = %q{Write a longer description or delete this line.}
-  spec.homepage      = "http://this-week-in-ruru.org/"
+  spec.summary       = %q{Rack-compatible application server}
+  spec.description   = %q{Application server for Rack apps built with Rust}
+  spec.homepage      = 'https://github.com/d-unseductable/trusted'
   spec.license       = 'MIT'
 
   spec.extensions << 'Rakefile'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusted
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dmitry Gritsay
@@ -128,7 +128,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: Write a longer description or delete this line.
+description: Application server for Rack apps built with Rust
 email:
 - unseductable@gmail.com
 executables:
@@ -176,7 +176,7 @@ files:
 - lib/trusted/request/processing_pool.rb
 - lib/trusted/version.rb
 - trusted.gemspec
-homepage: http://this-week-in-ruru.org/
+homepage: https://github.com/d-unseductable/trusted
 licenses:
 - MIT
 metadata: {}
@@ -199,5 +199,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Write a short summary, because Rubygems requires one.
+summary: Rack-compatible application server
 test_files: []