[ARVADOS] updated: 1.3.0-1252-gc12b6b673

[Git user]

Summary of changes:
 apps/workbench/lib/config_validators.rb | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

       via  c12b6b673802dcca6b6eb5d3fc5b10c151b2db76 (commit)
      from  fe06b864a537f5b6440a50bf85af9bc93d7aae80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c12b6b673802dcca6b6eb5d3fc5b10c151b2db76
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jul 3 16:18:11 2019 -0400

    14812: We can't log the error, might as well make it fatal.
    
    Rails.logger isn't initialized at this point.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/lib/config_validators.rb b/apps/workbench/lib/config_validators.rb
index 54f4b6db8..953b392e3 100644
--- a/apps/workbench/lib/config_validators.rb
+++ b/apps/workbench/lib/config_validators.rb
@@ -5,18 +5,16 @@
 require 'uri'
 
 module ConfigValidators
-    def self.validate_wb2_url_config
-        if Rails.configuration.Services.Workbench2.ExternalURL != URI("")
-          if !Rails.configuration.Services.Workbench2.ExternalURL.is_a?(URI::HTTP)
-            Rails.logger.warn("workbench2_url config is not an HTTP URL: #{Rails.configuration.Services.Workbench2.ExternalURL}")
-            Rails.configuration.Services.Workbench2.ExternalURL = URI("")
-          elsif /.*[\/]{2,}$/.match(Rails.configuration.Services.Workbench2.ExternalURL.to_s)
-            Rails.logger.warn("workbench2_url config shouldn't have multiple trailing slashes: #{Rails.configuration.Services.Workbench2.ExternalURL}")
-            Rails.configuration.Services.Workbench2.ExternalURL = URI("")
-          else
-            return true
-          end
-        end
-        return false
+  def self.validate_wb2_url_config
+    if Rails.configuration.Services.Workbench2.ExternalURL != URI("")
+      if !Rails.configuration.Services.Workbench2.ExternalURL.is_a?(URI::HTTP)
+        raise "workbench2_url config is not an HTTP URL: #{Rails.configuration.Services.Workbench2.ExternalURL}"
+      elsif /.*[\/]{2,}$/.match(Rails.configuration.Services.Workbench2.ExternalURL.to_s)
+        raise "workbench2_url config shouldn't have multiple trailing slashes: #{Rails.configuration.Services.Workbench2.ExternalURL}"
+      else
+        return true
+      end
     end
+    return false
+  end
 end

-----------------------------------------------------------------------


hooks/post-receive
--