diff --git a/.gitignore b/.gitignore index 00782fb0df2..9934d328239 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,6 @@ share/esx-fw-vnc/*.rpm share/esx-fw-vnc/.vagrant* *.vscode -*.code-workspace share/context/* !share/context/download_context.sh diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb index da9a4189b8f..4421ddb1b24 100755 --- a/src/market_mad/one_market.rb +++ b/src/market_mad/one_market.rb @@ -317,13 +317,12 @@ def failure(asym, id, message) [ '--threads', '-t', GetoptLong::OPTIONAL_ARGUMENT ], [ '--market-types', '-m', GetoptLong::OPTIONAL_ARGUMENT ], [ '--timeout', '-w', GetoptLong::OPTIONAL_ARGUMENT ], - [ '--proxy' '-p' , GetoptLong::OPTIONAL_ARGUMENT ] + [ '--proxy' , GetoptLong::OPTIONAL_ARGUMENT ] ) mp_type = nil threads = 15 timeout = nil -proxy = nil begin opts.each do |opt, arg| @@ -334,18 +333,12 @@ def failure(asym, id, message) mp_type = arg.split(',').map {|a| a.strip } when '--timeout' timeout = arg.to_i - when '--proxy' - timeout = arg.to_i end end rescue Exception => e exit(-1) end -#Export proxy ip:port as env var for curl - -ENV['http_proxy'] = File.read('/etc/one/oned.conf')[/(?<=--proxy\s)\S+/] - mp_driver = MarketPlaceDriver.new(mp_type, :concurrency => threads, :timeout => timeout)