Skip to content

Commit

Permalink
Merge pull request #145 from redBorder/development
Browse files Browse the repository at this point in the history
Release 2.2.3
  • Loading branch information
manegron authored Jul 16, 2024
2 parents 0ea3091 + fc177eb commit e742d08
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.2
2.2.3
2 changes: 1 addition & 1 deletion resources/scripts/rb_setup_wizard.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def cancel_wizard()
dhcp_interfaces = general_conf["network"]["interfaces"].select { |i| i["mode"] == "dhcp" }

if general_conf["network"]["interfaces"].size > 1
if static_interface.size == 1 && dhcp_interfaces.size >= 1
if static_interface && static_interface.size == 1 && dhcp_interfaces.size >= 1
general_conf["network"]["management_interface"] = static_interface["device"]
else
interface_options = general_conf["network"]["interfaces"].map { |i| [i["device"]] }
Expand Down
4 changes: 4 additions & 0 deletions resources/scripts/rb_sync_minio_cluster.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ def self.cluster_leader

# Module for making HTTP requests
module HTTP
HTTP_OPEN_TIMEOUT = 900
HTTP_READ_TIMEOUT = 900
# Sends an HTTP request.
#
# @param url [String] The URL to request.
Expand All @@ -91,6 +93,8 @@ module HTTP
def self.request(url, method, body = nil, cookie = nil, log: false)
uri = URI.parse(url)
http = Net::HTTP.new(uri.host, uri.port)
http.read_timeout = HTTP_READ_TIMEOUT
http.open_timeout = HTTP_OPEN_TIMEOUT

request_class = { 'POST' => Net::HTTP::Post, 'DELETE' => Net::HTTP::Delete }[method.upcase] || Net::HTTP::Get
request = request_class.new(uri.request_uri)
Expand Down

0 comments on commit e742d08

Please sign in to comment.