Merge branch 'issue#90_logicreverse' into develop

Author: Marcin Przepiorowski

bin/dx_get_analytics.pl

@@ -58,7 +58,7 @@
   'dever=s' => \(my $dever),
   'interval|i=s' => \($resolution),
   'version' => \(my $print_version),
-  'skipinvalid' => \(my $skipinvalid),
+  'stoponinvalid' => \(my $stoponinvalid),
   'nohead' => \(my $nohead),
   'configfile|c=s' => \(my $config_file)
 ) or pod2usage(-verbose => 1,  -input=>\*DATA);
@@ -153,7 +153,7 @@
   my $arguments = "&resolution=$resolution&startTime=$st_timestamp";
   my $endTime = $et_timestamp ? "&endTime=$et_timestamp" : "";
   $arguments = $arguments . $endTime;
-  $ret = $ret + $analytic_list->get_perf($type, $outdir, $arguments, $allowedres{$resolution}, $format, $skipinvalid );
+  $ret = $ret + $analytic_list->get_perf($type, $outdir, $arguments, $allowedres{$resolution}, $format, $stoponinvalid );
 
 }
 
@@ -178,7 +178,7 @@ =head1 SYNOPSIS
                         [-i interval ]
                         [-st <start_time> ]
                         [-et <end_time> ]
-                        [-skipinvalid ]
+                        [-stoponinvalid ]
                         -format csv|json
                         -debug
 
@@ -233,10 +233,10 @@ =head1 OPTIONS
 
 =over 4
 
-=item B<-skipinvalid>
-Skip broken or empty analytic output and contiune with other.
-Return code will be not 0 if there were any skipped analytics.
-Default is stop execution on first broken or empty analytic.
+=item B<-stoponinvalid>
+Stop on the invalid analytic and exit processing.
+Invalid analytics are skipped by default. Return code will be not 0 
+if there were any skipped analytics.
 
 =item B<-format>
 Display output in csv or json format

lib/Analytics.pm

@@ -145,7 +145,7 @@ sub get_perf {
     my $arguments = shift;
     my $resolution = shift;
     my $format = shift;
-    my $skipinvalid = shift;
+    my $stoponinvalid = shift;
 
     logger($self->{_debug}, "Entering Analytics::get_perf",1);
 
@@ -192,24 +192,24 @@ sub get_perf {
         if ($ret) {
             if ($ret eq 1) {
               print "Timeout during gathering data for " . $analytic->getName() . "\n";
-              if (defined($skipinvalid)) {
-                $returncode = $returncode + 1;
-              } else {
+              if (defined($stoponinvalid)) {
                 return 1;
+              } else {
+                $returncode = $returncode + 1;
               }
             } elsif ($ret eq 2) {
               print "No data returned for analytics " . $analytic->getName() . ". Consider restarting collector\n";
-              if (defined($skipinvalid)) {
-                $returncode = $returncode + 1;
-              } else {
+              if (defined($stoponinvalid)) {
                 return 2;
+              } else {
+                $returncode = $returncode + 1;
               }
             } else {
               print "Unknown error gathering a data for " . $analytic->getName() . "\n";
-              if (defined($skipinvalid)) {
-                $returncode = $returncode + 1;
-              } else {
+              if (defined($stoponinvalid)) {
                 return 3;
+              } else {
+                $returncode = $returncode + 1;
               }
             }
         } else {