From a6ebff06a7968c8455276f132ea9afc93c687257 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Fri, 30 Sep 2016 09:59:03 +0200
Subject: [PATCH] Add error message to wopi discovery

Fix ambigious open call
---
 app/models/asset.rb        | 2 +-
 app/utilities/wopi_util.rb | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/asset.rb b/app/models/asset.rb
index 6ec1964b2..aa583e160 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -338,7 +338,7 @@ class Asset < ActiveRecord::Base
   def favicon_url(action)
     file_ext = file_file_name.split('.').last
     action = get_action(file_ext, action)
-    action.wopi_app.icon if action.wopi_app
+    action.wopi_app.icon if action.try(:wopi_app)
   end
 
   # locked?, lock_asset and refresh_lock rely on the asset
diff --git a/app/utilities/wopi_util.rb b/app/utilities/wopi_util.rb
index 844936efa..b508856c7 100644
--- a/app/utilities/wopi_util.rb
+++ b/app/utilities/wopi_util.rb
@@ -33,7 +33,7 @@ module WopiUtil
     Rails.logger.warn 'Initializing discovery'
     discovery.destroy if discovery
 
-    @doc = Nokogiri::XML(open(ENV['WOPI_DISCOVERY_URL']))
+    @doc = Nokogiri::XML(Kernel.open(ENV['WOPI_DISCOVERY_URL']))
 
     discovery = WopiDiscovery.new
     discovery.expires = Time.now.to_i + DISCOVERY_TTL
@@ -65,8 +65,9 @@ module WopiUtil
       end
     end
     discovery
-  rescue
-    Rails.logger.warn 'Initialization failed'
+  rescue => e
+    Rails.logger.warn 'WOPI: initialization failed: ' + e.message
+    e.backtrace.each { |line| Rails.logger.error line }
     discovery = WopiDiscovery.first
     discovery.destroy if discovery
   end