From c028559965ea11100364c3b22e1de99f615e00e9 Mon Sep 17 00:00:00 2001
From: Daniel Clavijo Coca <dclavijo@opennebula.io>
Date: Mon, 30 May 2022 05:56:33 -0500
Subject: [PATCH] M #-: Fix onelog (#2086)

Co-authored-by: Alejandro Huertas <ahuertas@opennebula.io>
(cherry picked from commit d7484840fba8ee8564b496cd39df1debcaadcb91)
---
 src/cli/onelog | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/cli/onelog b/src/cli/onelog
index 0efae66c7b..8a2974f0c1 100755
--- a/src/cli/onelog
+++ b/src/cli/onelog
@@ -20,10 +20,32 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
+    end
+end
+# %%RUBYGEMS_SETUP_END%%
+
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
@@ -33,13 +55,13 @@ DEFAULT_PAGER = 'less'
 # List of OpenNebula services and the logs files
 SERVICES = {
     'fireedge' => { :log => 'fireedge.log', :error => 'fireedge.error' },
-    'monitor'  => 'monitor.log',
-    'novnc'    => 'novnc.log',
-    'oned'     => 'oned.log',
+    'monitor'  => { :log => 'monitor.log' },
+    'novnc'    => { :log => 'novnc.log' },
+    'oned'     => { :log => 'oned.log' },
     'onehem'   => { :log => 'onehem.log', :error => 'onehem.error' },
-    'sched'    => 'sched.log',
+    'sched'    => { :log => 'sched.log' },
     'sunstone' => { :log => 'sunstone.log', :error => 'sunstone.error' },
-    'vcenter'  => 'vcenter_monitor.log'
+    'vcenter'  => { :log => 'vcenter_monitor.log' }
 }
 
 require 'command_parser'
@@ -77,26 +99,22 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :get, get_desc, :service, :options => [TYPE, PAGER, PAGER_OPTS] do
-        unless SERVICES[args[0]]
+        logs  = SERVICES[args[0]]
+        pager = options[:pager] || DEFAULT_PAGER
+
+        unless logs
             STDERR.puts "Service '#{args[0]}' not found"
             exit 1
         end
 
-        if options[:type] && !SERVICES[args[0]][options[:type].to_sym]
+        if options[:type] && !logs[options[:type].to_sym]
             STDERR.puts "Log file type '#{options[:type]}' not found"
             exit 1
         end
 
-        if (SERVICES[args[0]].is_a? Hash) && !options[:type]
-            options[:type] = :log
-        end
+        options[:type].nil? ? f = logs[:log] : f = logs[options[:type].to_sym]
 
-        type  = options[:type].to_sym
-        pager = options[:pager] || DEFAULT_PAGER
-
-        type.nil? ? file = SERVICES[args[0]] : file = SERVICES[args[0]][type]
-
-        system("#{pager} #{options[:pager_opts]} /var/log/one/#{file}")
+        system("#{pager} #{options[:pager_opts]} /var/log/one/#{f}")
     end
 
     vm_desc = <<-EOT.unindent