Call OO correctly

Author: nigelhorne

cgi-bin/page.fcgi

@@ -103,6 +103,11 @@ Log::WarnDie->dispatcher($logger);
 # use VWF::Display::meta_data;
 
 use VWF::Data::index;
+if($@) {
+	$logger->error($@) if($logger);
+	Log::WarnDie->dispatcher(undef);
+	die $@;
+}
 use VWF::Data::vwf_log;
 
 my $database_dir = "$script_dir/../data";
@@ -194,6 +199,7 @@ while($handling_request = ($request->Accept() >= 0)) {
 		$logger = Log::Abstraction->new(logger => sub { print join(', ', @{$_[0]->{'message'}}), "\n" }, level => 'debug');
 		Log::WarnDie->dispatcher($logger);
 		$info->set_logger($logger);
+		# TODO - set logger on all databases
 		$index->set_logger($logger);
 		$vwf_log->set_logger($logger);
 		# $Config::Auto::Debug = 1;

lib/VWF/Display/meta_data.pm

@@ -7,10 +7,10 @@ use warnings;
 
 use parent 'VWF::Display';
 
+use Filesys::Df;
 use Time::Piece;
 use Time::Seconds;
 use System::Info;
-use Filesys::Df;
 use Sys::Uptime;
 use Sys::MemInfo;
 use Time::Piece;
@@ -34,10 +34,10 @@ sub html {
 	}
 
 	# --- Server metrics using CPAN modules ---
-	my $server_metrics = get_server_metrics();
+	my $server_metrics = $self->get_server_metrics();
 
 	# --- Traffic metrics from vwf_log ---
-	my $traffic_metrics = get_traffic_metrics($self, $vwf_log, $domain_name);
+	my $traffic_metrics = $self->get_traffic_metrics($vwf_log, $domain_name);
 
 	# --- HTTP status breakdown for pie chart ---
 	my $status_datapoints;
@@ -51,8 +51,8 @@ sub html {
 		$status_datapoints .= '{y: ' . $status_count{$code} . ", label: \"$code\"},\n";
 	}
 
-	my $rate_24h = get_request_rate_24h($self, $vwf_log, $domain_name);
-	my $latency_24h = get_latency_24h($self, $vwf_log, $domain_name);
+	my $rate_24h = $self->get_request_rate_24h($vwf_log, $domain_name);
+	my $latency_24h = $self->get_latency_24h($vwf_log, $domain_name);
 
 	return $self->SUPER::html({
 		datapoints => $datapoints,
@@ -234,7 +234,7 @@ sub get_latency_24h {
 		next unless @vals;
 
 		my $count = @vals;
-		my $avg = int( (eval(join('+', @vals)) || 0) / $count );
+		my $avg = int((eval(join('+', @vals)) || 0) / $count);
 
 		my $p95_index = int(0.95 * ($count - 1));
 		my $p95 = $vals[$p95_index];