* renamed --verbose-level to --log-level to make it more separate from --verbose.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1729 95ad53e4-c205-0410-b2fa-d234c58c8868

9 files changed, 18 insertions, 18 deletions

diff --git a/bin/slxsettings b/bin/slxsettings
index 6c081ddf..f3932f2f 100755
--- a/bin/slxsettings
+++ b/bin/slxsettings
@@ -246,11 +246,11 @@ slxsettings [options] [action ...]
       db-spec=<string>           full DBI-specification of database
       db-type=<string>           type of database to connect to
       locale=<string>            locale to use for translations
+      log-level=<int>            level of logging verbosity (0-3)
       logfile=<string>           file to write logging output to
       private-path=<string>      path to private data
       public-path=<string>       path to public (client-accesible) data
       temp-path=<string>         path to temporary data
-      verbose-level=<int>        level of logging verbosity (0-3)
 
 =head3 General Options
 
@@ -340,7 +340,7 @@ Sets path to temporary data.
 
 Default is $SLX_TEMP_PATH (usually F</tmp>.
 
-=item B<<     verbose-level=<int> >>
+=item B<<     log-level=<int> >>
 
 Sets the level of logging verbosity (0-3).
 Prints additional output for debugging. N is a number between 0 and 3. Level
diff --git a/config-db/slxconfig b/config-db/slxconfig
index 8453b6b9..cd3b3ec2 100755
--- a/config-db/slxconfig
+++ b/config-db/slxconfig
@@ -1711,11 +1711,11 @@ which can be used to overrule the OpenSLX settings:
     --db-spec=<string>         full DBI-specification of database
     --db-type=<string>         type of database to connect to
     --locale=<string>          locale to use for translations
+    --log-level=<int>          level of logging verbosity (0-3)
     --logfile=<string>         file to write logging output to
     --private-path=<string>    path to private data
     --public-path=<string>     path to public (client-accesible) data
     --temp-path=<string>       path to temporary data
-    --verbose-level=<int>      level of logging verbosity (0-3)
 
 Please refer to the C<slxsettings>-manpage for a more detailed description
 of these options.
diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer
index f6592b88..a0c64ff9 100755
--- a/config-db/slxconfig-demuxer
+++ b/config-db/slxconfig-demuxer
@@ -310,7 +310,7 @@ sub writeAttributesToFile
     # will never again try to fiddle with machine-setup directly the
     # file-system. From now on the DB is the keeper of that info.
     spitFile($fileName, $content);
-    if ($openslxConfig{'verbose-level'} > 2) {
+    if ($openslxConfig{'log-level'} > 2) {
         vlog(0, "--- START OF $fileName ---");
         vlog(0, $content);
         vlog(0, "--- END OF $fileName --- ");
@@ -695,7 +695,7 @@ sub writePluginConfigurationsForSystem
         }
         my $fileName = "$pluginConfPath/${pluginName}.conf";
         spitFile($fileName, $content);
-        if ($openslxConfig{'verbose-level'} > 2) {
+        if ($openslxConfig{'log-level'} > 2) {
             vlog(0, "--- START OF $fileName ---");
             vlog(0, $content);
             vlog(0, "--- END OF $fileName --- ");
@@ -958,11 +958,11 @@ which can be used to overrule the OpenSLX settings:
     --db-spec=<string>         full DBI-specification of database
     --db-type=<string>         type of database to connect to
     --locale=<string>          locale to use for translations
+    --log-level=<int>          level of logging verbosity (0-3)
     --logfile=<string>         file to write logging output to
     --private-path=<string>    path to private data
     --public-path=<string>     path to public (client-accesible) data
     --temp-path=<string>       path to temporary data
-    --verbose-level=<int>      level of logging verbosity (0-3)
 
 Please refer to the C<slxsettings>-manpage for a more detailed description
 of these options.
diff --git a/config-db/t/run-all-tests.pl b/config-db/t/run-all-tests.pl
index 4ae59a7d..8fb351c7 100755
--- a/config-db/t/run-all-tests.pl
+++ b/config-db/t/run-all-tests.pl
@@ -23,7 +23,7 @@ $cmdlineConfig{'db-type'}      = $ENV{SLX_DB_TYPE}      = 'SQLite';
 
 openslxInit();
 
-$Test::Harness::Verbose = 1 if $openslxConfig{'verbose-level'};
+$Test::Harness::Verbose = 1 if $openslxConfig{'log-level'};
 
 # remove the test-db if it already exists 
 my $metaDB = OpenSLX::MetaDB::SQLite->new();
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 503b10cb..378d572e 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -720,7 +720,7 @@ sub _readDistroInfo
     }
 
     # dump distro-info, if asked for:
-    if ($openslxConfig{'verbose-level'} >= 2) {
+    if ($openslxConfig{'log-level'} >= 2) {
         my $repository = $self->{'distro-info'}->{repository};
         foreach my $r (sort keys %$repository) {
             vlog(2, "repository '$r':");
diff --git a/installer/slxos-export b/installer/slxos-export
index 3d14a383..b8f1a458 100755
--- a/installer/slxos-export
+++ b/installer/slxos-export
@@ -309,11 +309,11 @@ which can be used to overrule the OpenSLX settings:
     --db-spec=<string>         full DBI-specification of database
     --db-type=<string>         type of database to connect to
     --locale=<string>          locale to use for translations
+    --log-level=<int>          level of logging verbosity (0-3)
     --logfile=<string>         file to write logging output to
     --private-path=<string>    path to private data
     --public-path=<string>     path to public (client-accesible) data
     --temp-path=<string>       path to temporary data
-    --verbose-level=<int>      level of logging verbosity (0-3)
 
 Please refer to the C<slxsettings>-manpage for a more detailed description
 of these options.
diff --git a/installer/slxos-setup b/installer/slxos-setup
index e5e44d58..bcbca72e 100755
--- a/installer/slxos-setup
+++ b/installer/slxos-setup
@@ -389,11 +389,11 @@ which can be used to overrule the OpenSLX settings:
     --db-spec=<string>         full DBI-specification of database
     --db-type=<string>         type of database to connect to
     --locale=<string>          locale to use for translations
+    --log-level=<int>          level of logging verbosity (0-3)
     --logfile=<string>         file to write logging output to
     --private-path=<string>    path to private data
     --public-path=<string>     path to public (client-accesible) data
     --temp-path=<string>       path to temporary data
-    --verbose-level=<int>      level of logging verbosity (0-3)
 
 Please refer to the C<slxsettings>-manpage for a more detailed description
 of these options.
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index fce40cfc..48d5ed78 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -87,10 +87,10 @@ I<slxsettings>-script, so please look there if you'd like to know more.
     'locale-charmap' => `locale charmap`,
     'base-path'      => $ENV{SLX_BASE_PATH} || '/opt/openslx',
     'config-path'    => $ENV{SLX_CONFIG_PATH} || '/etc/opt/openslx',
+    'log-level'      => $ENV{SLX_VERBOSE_LEVEL} || '0',
     'private-path'   => $ENV{SLX_PRIVATE_PATH} || '/var/opt/openslx',
     'public-path'    => $ENV{SLX_PUBLIC_PATH} || '/srv/openslx',
     'temp-path'      => $ENV{SLX_TEMP_PATH} || '/tmp',
-    'verbose-level'  => $ENV{SLX_VERBOSE_LEVEL} || '0',
 
     #
     # options useful during development only:
@@ -148,6 +148,9 @@ my %openslxCmdlineArgs = (
     # locale-charmap to use for I/O (iso-8859-1, utf-8, etc.)
     'locale-charmap=s' => \$cmdlineConfig{'locale-charmap'},
 
+    # level of logging verbosity (0-3)
+    'log-level=i' => \$cmdlineConfig{'log-level'},
+
     # file to write logging output to, defaults to STDERR
     'logfile=s' => \$cmdlineConfig{'locale'},
 
@@ -161,9 +164,6 @@ my %openslxCmdlineArgs = (
 
     # path to temporary data (used during demuxing)
     'temp-path=s' => \$cmdlineConfig{'temp-path'},
-
-    # level of logging verbosity (0-3)
-    'verbose-level=i' => \$cmdlineConfig{'verbose-level'},
 );
 
 # filehandle used for logging:
@@ -199,7 +199,7 @@ sub openslxInit
     my $configPath 
         = $cmdlineConfig{'config-path'} || $openslxConfig{'config-path'};
     my $sharePath = "$openslxConfig{'base-path'}/share";
-    my $verboseLevel = $cmdlineConfig{'verbose-level'} || 0;
+    my $verboseLevel = $cmdlineConfig{'log-level'} || 0;
     foreach my $f (
         "$sharePath/settings.default", 
         "$configPath/settings",
@@ -246,7 +246,7 @@ sub openslxInit
                 )
             );
     }
-    if ($openslxConfig{'verbose-level'} >= 2) {
+    if ($openslxConfig{'log-level'} >= 2) {
         foreach my $key (sort keys %openslxConfig) {
             my $val = $openslxConfig{$key} || '';
             vlog(2, "config-dump: $key = $val");
@@ -269,7 +269,7 @@ the given I<$level>.
 sub vlog
 {
     my $minLevel = shift;
-    return if $minLevel > $openslxConfig{'verbose-level'};
+    return if $minLevel > $openslxConfig{'log-level'};
     my $str = join("", '-' x $minLevel, @_);
     if (substr($str, -1, 1) ne "\n") {
         $str .= "\n";
diff --git a/os-plugins/slxos-plugin b/os-plugins/slxos-plugin
index e94be5d4..0b70211d 100755
--- a/os-plugins/slxos-plugin
+++ b/os-plugins/slxos-plugin
@@ -495,11 +495,11 @@ which can be used to overrule the OpenSLX settings:
     --db-spec=<string>         full DBI-specification of database
     --db-type=<string>         type of database to connect to
     --locale=<string>          locale to use for translations
+    --log-level=<int>          level of logging verbosity (0-3)
     --logfile=<string>         file to write logging output to
     --private-path=<string>    path to private data
     --public-path=<string>     path to public (client-accesible) data
     --temp-path=<string>       path to temporary data
-    --verbose-level=<int>      level of logging verbosity (0-3)
 
 Please refer to the C<slxsettings>-manpage for a more detailed description
 of these options.