Skip to content

Commit 5fce6bb

Browse files
committed
Remove unused em-http-request
* this gem is blocking us from upgrading to Ruby 3.3, but it seems we don't actually use it
1 parent d84cd86 commit 5fce6bb

File tree

3 files changed

+0
-72
lines changed

3 files changed

+0
-72
lines changed

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ gem 'allowy', '>= 2.1.0'
55
gem 'clockwork', require: false
66
gem 'cloudfront-signer'
77
gem 'digest-xxhash'
8-
gem 'em-http-request', '~> 1.1'
98
gem 'eventmachine', '~> 1.2.7'
109
gem 'fluent-logger'
1110
gem 'googleapis-common-protos', '>= 1.3.12'

Gemfile.lock

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ GEM
130130
coderay (1.1.3)
131131
concurrent-ruby (1.3.4)
132132
connection_pool (2.4.1)
133-
cookiejar (0.3.3)
134133
crack (1.0.0)
135134
bigdecimal
136135
rexml
@@ -148,14 +147,6 @@ GEM
148147
domain_name (0.6.20240107)
149148
drb (2.2.1)
150149
e2mmap (0.1.0)
151-
em-http-request (1.1.7)
152-
addressable (>= 2.3.4)
153-
cookiejar (!= 0.3.1)
154-
em-socksify (>= 0.3)
155-
eventmachine (>= 1.0.3)
156-
http_parser.rb (>= 0.6.0)
157-
em-socksify (0.3.2)
158-
eventmachine (>= 1.0.0.beta.4)
159150
erubi (1.13.0)
160151
eventmachine (1.2.7)
161152
excon (0.112.0)
@@ -275,7 +266,6 @@ GEM
275266
http-cookie (1.0.5)
276267
domain_name (~> 0.5)
277268
http-form_data (2.3.0)
278-
http_parser.rb (0.6.0)
279269
httpclient (2.8.3)
280270
i18n (1.14.6)
281271
concurrent-ruby (~> 1.0)
@@ -609,7 +599,6 @@ DEPENDENCIES
609599
codeclimate-test-reporter (>= 1.0.8)
610600
debug (~> 1.9)
611601
digest-xxhash
612-
em-http-request (~> 1.1)
613602
eventmachine (~> 1.2.7)
614603
fluent-logger
615604
fog-aliyun
Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# Copyright (c) 2009-2011 VMware, Inc.
2-
require 'eventmachine'
3-
require 'em-http-request'
42
require 'httpclient'
53

64
require 'vcap/services/api/const'
@@ -13,38 +11,6 @@ module Api
1311
end
1412

1513
module VCAP::Services::Api
16-
class AsyncHttpRequest
17-
class << self
18-
def new(url, token, verb, timeout, msg=VCAP::Services::Api::EMPTY_REQUEST)
19-
req = {
20-
head: {
21-
VCAP::Services::Api::GATEWAY_TOKEN_HEADER => token,
22-
'Content-Type' => 'application/json'
23-
},
24-
body: msg.encode
25-
}
26-
if timeout
27-
EM::HttpRequest.new(url, inactivity_timeout: timeout).send(verb.to_sym, req)
28-
else
29-
EM::HttpRequest.new(url).send(verb.to_sym, req)
30-
end
31-
end
32-
33-
def request(url, token, verb, timeout, msg=VCAP::Services::Api::EMPTY_REQUEST)
34-
req = new(url, token, verb, timeout, msg)
35-
f = Fiber.current
36-
req.callback { f.resume(req) }
37-
req.errback { f.resume(req) }
38-
http = Fiber.yield
39-
raise UnexpectedResponse.new("Error sending request #{msg.extract.to_json} to gateway #{@url}: #{http.error}") unless http.error.empty?
40-
41-
code = http.response_header.status.to_i
42-
body = http.response
43-
[code, body]
44-
end
45-
end
46-
end
47-
4814
module SynchronousHttpRequest
4915
def self.request(url, token, verb, _timeout, msg=VCAP::Services::Api::EMPTY_REQUEST)
5016
header = {
@@ -57,30 +23,4 @@ def self.request(url, token, verb, _timeout, msg=VCAP::Services::Api::EMPTY_REQU
5723
[msg.code, msg.body]
5824
end
5925
end
60-
61-
class AsyncHttpMultiPartUpload
62-
class << self
63-
def new(url, timeout, multipart, head={})
64-
req = {
65-
head: head,
66-
body: '',
67-
multipart: multipart
68-
}
69-
70-
if timeout
71-
EM::HttpRequest.new(url, inactivity_timeout: timeout).post req
72-
else
73-
EM::HttpRequest.new(url).post req
74-
end
75-
end
76-
77-
def fibered(url, timeout, multipart, head={})
78-
req = new(url, timeout, multipart, head)
79-
f = Fiber.current
80-
req.callback { f.resume(req) }
81-
req.errback { f.resume(req) }
82-
Fiber.yield
83-
end
84-
end
85-
end
8626
end

0 commit comments

Comments
 (0)