Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit92b5be9

Browse files
committed
Move rest_logger from client.rb to connection.rb
1 parent7602f1d commit92b5be9

File tree

2 files changed

+28
-32
lines changed

2 files changed

+28
-32
lines changed

‎lib/ruby_vcloud_sdk/client.rb‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,10 @@ class Client
3535

3636
private_constant:RETRIES,:TIME_LIMIT_SEC,:REST_THROTTLE
3737

38-
definitialize(url,username,password,option={},logger=nil)
38+
definitialize(url,username,password,options={},logger=nil)
3939
@logger=logger ||Logger.new(STDOUT)
40-
@retries=option[:retries] ||RETRIES
41-
@time_limit=option[:time_limit_sec] ||TIME_LIMIT_SEC
42-
43-
construct_rest_logger
44-
Config.configure(
45-
{
46-
rest_logger:@rest_logger,
47-
rest_throttle:option[:rest_throttle] ||REST_THROTTLE
48-
})
40+
@retries=options[:retries] ||RETRIES
41+
@time_limit=options[:time_limit_sec] ||TIME_LIMIT_SEC
4942

5043
@connection=Connection::Connection.new(
5144
@url,
@@ -905,19 +898,6 @@ def eject_media_task(vm, params, media)
905898
end
906899
end
907900
end
908-
909-
defconstruct_rest_logger
910-
@logger.debug('constructing rest_logger')
911-
rest_log_filename=File.join(
912-
File.dirname(@logger.instance_eval{@logdev}.dev.path),
913-
'rest')
914-
log_file=File.open(rest_log_filename,'w')
915-
log_file.sync=true
916-
917-
@rest_logger=Logger.new(log_file ||STDOUT)
918-
@rest_logger.level=@logger.level
919-
@rest_logger.formatter=@logger.formatter
920-
end
921901
end
922902

923903
end

‎lib/ruby_vcloud_sdk/connection/connection.rb‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ class Connection
1010
definitialize(url,request_timeout=nil,
1111
rest_client=nil,site=nil,file_uploader=nil)
1212
@logger=Config.logger
13-
@rest_logger=Config.rest_logger
1413
@rest_throttle=Config.rest_throttle
14+
15+
construct_rest_logger
16+
Config.configure(rest_logger:@rest_logger)
17+
1518
rest_client=RestClientunlessrest_client
1619
rest_client.log=@rest_logger
1720
request_timeout=60unlessrequest_timeout
@@ -26,7 +29,7 @@ def connect(username, password)
2629
auth_header_value="Basic#{Base64.encode64(login_password)}"
2730
# TODO: call 'api/versions' first
2831
response=@site["/api/sessions"].post(
29-
{Authorization:auth_header_value,Accept:ACCEPT})
32+
Authorization:auth_header_value,Accept:ACCEPT)
3033
@logger.debug(response)
3134
@cookies=response.cookies
3235
unless@cookies["vcloud-token"].gsub!("+","%2B").nil?
@@ -40,10 +43,9 @@ def get(destination)
4043
@rest_logger.info"#{__method__.to_s.upcase}#{delay}\t " +
4144
"#{self.class.get_href(destination)}"
4245
sleep(delay)
43-
response=@site[get_nested_resource(destination)].get({
44-
:Accept=>ACCEPT,
45-
:cookies=>@cookies
46-
})
46+
response=@site[get_nested_resource(destination)].get(
47+
Accept:ACCEPT,
48+
cookies:@cookies)
4749
@rest_logger.debug(response)
4850
Xml::WrapperFactory.wrap_document(response)
4951
end
@@ -58,9 +60,9 @@ def post(destination, data, content_type = '*/*')
5860
end
5961
@rest_logger.info("#{__method__.to_s.upcase} data:#{data.to_s}")
6062
response=@site[get_nested_resource(destination)].post(data.to_s,{
61-
:Accept=>ACCEPT,
62-
:cookies=>@cookies,
63-
:content_type=>content_type
63+
Accept:ACCEPT,
64+
cookies:@cookies,
65+
content_type:content_type
6466
})
6567
raiseApiRequestErrorifhttp_error?(response)
6668
@rest_logger.debug(response)
@@ -119,6 +121,20 @@ def put_file(destination, file)
119121
end
120122

121123
private
124+
125+
defconstruct_rest_logger
126+
@logger.debug('constructing rest_logger')
127+
rest_log_filename=File.join(
128+
File.dirname(@logger.instance_eval{@logdev}.dev.path),
129+
'rest')
130+
log_file=File.open(rest_log_filename,'w')
131+
log_file.sync=true
132+
133+
@rest_logger=Logger.new(log_file ||STDOUT)
134+
@rest_logger.level=@logger.level
135+
@rest_logger.formatter=@logger.formatter
136+
end
137+
122138
deflog_exceptions(e)
123139
ife.is_a?RestClient::Exception
124140
@logger.error("HTTP Code:#{e.http_code}")

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp