From 26c7333de69480b5954020f3d11c93e83a07e18d Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Thu, 1 Mar 2012 12:55:33 +0100
Subject: [PATCH] Feature #924: Complete occi server UI-related upgrade to use
 new logger (cherry picked from commit
 407f19f86d234d0fd233b34c385ae96689aeb44d)

---
 src/cloud/occi/lib/OCCIServer.rb  | 5 +++--
 src/cloud/occi/lib/occi-server.rb | 8 ++++++--
 src/sunstone/OpenNebulaVNC.rb     | 5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/cloud/occi/lib/OCCIServer.rb b/src/cloud/occi/lib/OCCIServer.rb
index 8d831ee86a..a3102da56c 100755
--- a/src/cloud/occi/lib/OCCIServer.rb
+++ b/src/cloud/occi/lib/OCCIServer.rb
@@ -568,7 +568,7 @@ class OCCIServer < CloudServer
             return [404, error]
         end
 
-        vnc_proxy = OpenNebulaVNC.new(config,{:json_errors => false})
+        vnc_proxy = OpenNebulaVNC.new(config, logger, {:json_errors => false})
         return vnc_proxy.start(vm)
     end
 
@@ -576,7 +576,8 @@ class OCCIServer < CloudServer
         begin
             OpenNebulaVNC.stop(pipe)
         rescue Exception => e
-            return [500, e.message]
+            logger.error {e.message}
+            return [500, "Error stopping VNC. Please check server logs."]
         end
         
         return [200,nil]
diff --git a/src/cloud/occi/lib/occi-server.rb b/src/cloud/occi/lib/occi-server.rb
index 5d2655179f..baf2ed8ad1 100755
--- a/src/cloud/occi/lib/occi-server.rb
+++ b/src/cloud/occi/lib/occi-server.rb
@@ -136,7 +136,9 @@ before do
             error 401, ""
         else
             client  = settings.cloud_auth.client(username)
-            @occi_server = OCCIServer.new(client, settings.config, settings.logger)
+            @occi_server = OCCIServer.new(client,
+                                          settings.config,
+                                          settings.logger)
         end
     end
 end
@@ -172,7 +174,9 @@ helpers do
             error 401, ""
         else
             client  = settings.cloud_auth.client(username)
-            @occi_server = OCCIServer.new(client, settings.config, settings.logger)
+            @occi_server = OCCIServer.new(client,
+                                          settings.config,
+                                          settings.logger)
 
             user_id = OpenNebula::User::SELF
             user    = OpenNebula::User.new_with_id(user_id, client)
diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb
index 71c92b6fe2..8d0285c079 100644
--- a/src/sunstone/OpenNebulaVNC.rb
+++ b/src/sunstone/OpenNebulaVNC.rb
@@ -21,7 +21,7 @@ require 'OpenNebula'
 # This class provides support for launching and stopping a websockify proxy
 #
 class OpenNebulaVNC
-    def initialize(config, opt={:json_errors => true})
+    def initialize(config, logger, opt={:json_errors => true})
         @proxy_path      = config[:vnc_proxy_path]
         @proxy_base_port = config[:vnc_proxy_base_port].to_i
 
@@ -36,6 +36,7 @@ class OpenNebulaVNC
         end
 
         @options = opt
+        @logger = logger
     end
 
     # Start a VNC proxy
@@ -71,7 +72,7 @@ class OpenNebulaVNC
         cmd ="#{@proxy_path} #{proxy_options} #{proxy_port} #{host}:#{vnc_port}"
 
         begin
-            $stderr.puts("Starting vnc proxy: #{cmd}")
+            @logger.info { "Starting vnc proxy: #{cmd}" }
             pipe = IO.popen(cmd)
         rescue Exception => e
             return [500, OpenNebula::Error.new(e.message).to_json]