Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Fix for #620 and #224: prevent implicit conversion of nil to string #647

Merged
merged 2 commits into from
Oct 27, 2016
Merged

Fix for #620 and #224: prevent implicit conversion of nil to string #647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b31945e
Fix for #620 and #224
RobertSzkutak Aug 23, 2016
470ac6b
Raise an exception instead of setting ml.server to an empty string
RobertSzkutak Aug 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion deploy/lib/server_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ def initialize(options)
@config_file = @properties["ml.config.file"]

@properties["ml.server"] = @properties["ml.#{@environment}-server"] unless @properties["ml.server"]
if (@properties["ml.server"] == nil)
raise "Error! ml.server not set. You may be missing deploy/" + @properties["environment"] + ".properties"
end

@hostname = @properties["ml.server"]
@bootstrap_port_four = @properties["ml.bootstrap-port-four"]
Expand Down Expand Up @@ -128,7 +131,7 @@ def info
logger.info "IS_JAR: #{@@is_jar}"
logger.info "Properties:"
@properties.sort {|x,y| x <=> y}.each do |k, v|
logger.info k + ": " + v
logger.info k + ": " + v.to_s
end
end
return true
Expand Down