From 2a8ee786dab592a2f2cd8fe5c0a8ef0825f3450d Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 5 Mar 2013 16:12:37 +0100 Subject: [PATCH] feature #1370: add status and restart to novnc script --- src/sunstone/OpenNebulaVNC.rb | 10 ++++++++++ src/sunstone/bin/novnc-server | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 8d5f09ecd1..db0624803b 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -182,6 +182,16 @@ class OpenNebulaVNC true end + def status + if is_running? + STDOUT.puts "novnc is running" + true + else + STDOUT.puts "novnc is NOT running" + false + end + end + private def error(code, msg) diff --git a/src/sunstone/bin/novnc-server b/src/sunstone/bin/novnc-server index 995baf8444..e203ff4bf6 100755 --- a/src/sunstone/bin/novnc-server +++ b/src/sunstone/bin/novnc-server @@ -69,9 +69,18 @@ if ARGV[0] vnc.start when :stop vnc.stop(ARGV[1]=='--force') + when :restart + vnc.stop + sleep 1 + vnc.start + when :status + vnc.status end - exit(-1) if !res + if !res + STDERR.puts "Error, check #{VNC_LOG}" + exit(-1) + end else exit(-1) end