Skip to content

Commit

Permalink
Merge pull request #5 from winebarrel/support_http2_settings_header
Browse files Browse the repository at this point in the history
Support submiting HTTP2-Settings header
  • Loading branch information
winebarrel authored Jul 4, 2019
2 parents b75e012 + c961e98 commit 9c9d2d5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion griffin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'rspec'
spec.add_development_dependency 'rubocop'

spec.add_dependency 'grpc_kit', '>= 0.3.6'
spec.add_dependency 'grpc_kit', '>= 0.3.8'
spec.add_dependency 'serverengine', '~> 2.0.7'
end
1 change: 1 addition & 0 deletions lib/griffin/engine/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def initialize
min_connection_size: config[:min_connection_size],
max_connection_size: config[:max_connection_size],
interceptors: config[:interceptors],
settings: config[:http2_settings],
)
@socket_manager_path = ServerEngine::SocketManager::Server.generate_path
@socket_manager_server = ServerEngine::SocketManager::Server.open(@socket_manager_path)
Expand Down
5 changes: 3 additions & 2 deletions lib/griffin/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ def config_builder
# @param min_connection_size [Integer] Maximun connection of TCP
# @param max_connection_size [Integer] Minimum connection of TCP
# @param interceptors [Array<GrpcKit::GRPC::ServerInterceptor>] list of interceptors
def initialize(min_pool_size:, max_pool_size:, min_connection_size:, max_connection_size:, interceptors: [], **opts)
# @param settings [Array<DS9::Settings,Integer>] list of HTTP2-Settings headers
def initialize(min_pool_size:, max_pool_size:, min_connection_size:, max_connection_size:, interceptors: [], settings: [], **opts)
@min_connection_size = min_connection_size
@max_connection_size = max_connection_size
@server = GrpcKit::Server.new(interceptors: interceptors, min_pool_size: min_pool_size, max_pool_size: max_pool_size)
@server = GrpcKit::Server.new(interceptors: interceptors, min_pool_size: min_pool_size, max_pool_size: max_pool_size, settings: settings)
@opts = opts
@status = :run
@worker_id = 0
Expand Down
6 changes: 6 additions & 0 deletions lib/griffin/server_config_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class ServerConfigBuilder
:min_pool_size,
:max_connection_size,
:min_connection_size,
:http2_settings,
].freeze

GRPC_CONFIGS = %i[services interceptors].freeze
Expand All @@ -40,6 +41,7 @@ def to_h
min_connection_size: DEFAULT_CONNECTION_SIZE,
interceptors: [],
services: [],
http2_settings: [],
}.freeze

def initialize
Expand Down Expand Up @@ -68,6 +70,10 @@ def connection_size(min, max)
@opts[:max_connection_size] = Integer(max)
end

def http2_settings(settings)
@opts[:http2_settings] = settings
end

def interceptors(*value)
@opts[:interceptors].concat(value).flatten!
end
Expand Down

0 comments on commit 9c9d2d5

Please sign in to comment.