Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Purging `self.reconfigure!`. It was for config testing which is now h…

…andled differently.
  • Loading branch information...
commit ca2333ae8c3cdb2661ebc0036c59f574ca14d677 1 parent 391b90b
@Slotos authored
Showing with 0 additions and 16 deletions.
  1. +0 −16 lib/casserver/server.rb
View
16 lib/casserver/server.rb
@@ -159,16 +159,6 @@ def self.load_config_file(config_file)
set :config, config
end
- def self.reconfigure!(config)
- config.each do |key, val|
- self.config[key] = val
- end
- init_database!
- init_logger!
- init_authenticators!
- init_matchers!
- end
-
def self.handler_options
handler_options = {
:Host => bind || config[:bind_address],
@@ -215,10 +205,6 @@ def self.handler_ssl_options
end
def self.init_matchers!
- # to avoid stacking rack middlewares let's first remove omniauth middlewares
- # adding this block to support #reconfigure! that doesn't appear to be called from anywhere (my ignorance of sinatra ways implied)
- @middleware.delete_if{|m| m.include? OmniAuth::Builder }
-
return nil unless config[:matcher]
config[:matcher].each do |name, conf|
@@ -783,8 +769,6 @@ def compile_template(engine, data, options, views)
super engine, data, options, views
end
- private
-
def confirm_authentication!(username, service = nil, *args)
extra_attributes = args.extract_options!
$LOG.debug("Authenticator provided additional user attributes: #{extra_attributes.inspect}") unless extra_attributes.blank?

0 comments on commit ca2333a

Please sign in to comment.
Something went wrong with that request. Please try again.