Skip to content

Commit 501dd5f

Browse files
committed
Remove support for legacy environments.
1 parent 0223f03 commit 501dd5f

17 files changed

Lines changed: 9 additions & 175 deletions

File tree

lib/falcon/command/paths.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Released under the MIT License.
44
# Copyright, 2020-2024, by Samuel Williams.
55

6-
require_relative "../configuration"
6+
require "async/service/configuration"
77

88
module Falcon
99
module Command
@@ -21,7 +21,7 @@ def resolved_paths(&block)
2121

2222
# Build a configuration based on the resolved paths.
2323
def configuration
24-
configuration = Configuration.new
24+
configuration = Async::Service::Configuration.new
2525

2626
self.resolved_paths do |path|
2727
path = File.expand_path(path)

lib/falcon/command/proxy.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def environment(**options)
4343
end
4444

4545
def configuration
46-
Configuration.for(
46+
Async::Service::Configuration.for(
4747
self.environment(environments: super.environments)
4848
)
4949
end

lib/falcon/command/redirect.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def environment(**options)
4242
end
4343

4444
def configuration
45-
Configuration.for(
45+
Async::Service::Configuration.for(
4646
self.environment(environments: super.environments)
4747
)
4848
end

lib/falcon/command/serve.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
require_relative "../server"
88
require_relative "../endpoint"
9-
require_relative "../configuration"
109
require_relative "../service/server"
1110
require_relative "../environment/rackup"
1211

12+
require "async/service/configuration"
1313
require "async/container"
1414
require "async/http/client"
1515
require "samovar"
@@ -83,7 +83,7 @@ def environment
8383
end
8484

8585
def configuration
86-
Configuration.new.tap do |configuration|
86+
Async::Service::Configuration.new.tap do |configuration|
8787
configuration.add(self.environment)
8888
end
8989
end

lib/falcon/configuration.rb

Lines changed: 0 additions & 90 deletions
This file was deleted.

lib/falcon/environment.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
module Falcon
77
# Pre-defined environments for hosting web applications.
8-
#
9-
# See {Configuration::Loader#load} for more details.
108
module Environment
11-
LEGACY_ENVIRONMENTS = {}
129
end
1310
end

lib/falcon/environment/configured.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def resolved_configuration_paths
2626
end
2727

2828
def configuration
29-
::Async::Service::Configuration.load(resolved_configuration_paths)
29+
Async::Service::Configuration.load(resolved_configuration_paths)
3030
end
3131
end
3232
end

lib/falcon/environment/lets_encrypt_tls.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ def ssl_private_key_path
2828
File.join(lets_encrypt_root, authority, "privkey.pem")
2929
end
3030
end
31-
32-
LEGACY_ENVIRONMENTS[:lets_encrypt_tls] = LetsEncryptTLS
3331
end
3432
end

lib/falcon/environment/proxy.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,5 @@ def middleware
101101
return Middleware::Proxy.new(Middleware::BadRequest, self.hosts)
102102
end
103103
end
104-
105-
LEGACY_ENVIRONMENTS[:proxy] = Proxy
106104
end
107105
end

lib/falcon/environment/rack.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ module Rack
1414
include Application
1515
include Rackup
1616
end
17-
18-
LEGACY_ENVIRONMENTS[:rack] = Rack
1917
end
2018
end

0 commit comments

Comments
 (0)