From 698b7ac5b7ce487dfae7c5ec4589e42792a7c97a Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sat, 19 Nov 2011 11:49:53 +0100 Subject: [PATCH] Bug 7247 - rebuild_zebra.pl -v should show all Zebra log output Currently, -v option resets Zebra log output to default system values. This produce amount of log specified in system defaults which is usually too low for debugging. This change explicitly forces all Zebra log output which create much more chatter so it triggers with verbosity level 2 Test scenario: 1. pick koha site to reindex 2. use -v -v options to rebuild_zebra.pl to see additional output Signed-off-by: Liz Rea Verified help corrections and loglevel 2 output vs. loglevel 1 output. No issues found. Signed-off-by: Paul Poulain (cherry picked from commit 90d68d6f5c1c34ed15ac35672ef5e5994a3b39c8) Signed-off-by: Chris Nighswonger (cherry picked from commit 17b3c7ce9178b34cb2e00dbe82fb9f908289a709) Signed-off-by: Chris Nighswonger --- misc/migration_tools/rebuild_zebra.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl index fa87f22a91..97b54d362f 100755 --- a/misc/migration_tools/rebuild_zebra.pl +++ b/misc/migration_tools/rebuild_zebra.pl @@ -34,7 +34,7 @@ my $want_help; my $as_xml; my $process_zebraqueue; my $do_not_clear_zebraqueue; -my $verbose_logging; +my $verbose_logging = 0; my $zebraidx_log_opt = " -v none,fatal,warn "; my $result = GetOptions( 'd:s' => \$directory, @@ -51,7 +51,7 @@ my $result = GetOptions( 'x' => \$as_xml, 'y' => \$do_not_clear_zebraqueue, 'z' => \$process_zebraqueue, - 'v' => \$verbose_logging, + 'v+' => \$verbose_logging, ); @@ -96,8 +96,8 @@ if ($noshadow) { # -v is for verbose, which seems backwards here because of how logging is set # on the CLI of zebraidx. It works this way. The default is to not log much -if ($verbose_logging) { - $zebraidx_log_opt = ''; +if ($verbose_logging >= 2) { + $zebraidx_log_opt = '-v none,fatal,warn,all'; } my $use_tempdir = 0; @@ -637,6 +637,7 @@ Parameters: -v increase the amount of logging. Normally only warnings and errors from the indexing are shown. + Use log level 2 (-v -v) to include all Zebra logs. -munge-config Deprecated option to try to fix Zebra config files. -- 2.39.5