X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2FStatus.html;h=af58f35097676bd2c4bdd433bc43e1c172362317;hp=2d91b0b875cb16f3225a51b0f91ddc146a623273;hb=8960c4e6ed107f83874647efe178f6e6845178bd;hpb=52177b4dcb0139da78d6e4200eaa16ec6a6f159b diff --git a/httemplate/view/Status.html b/httemplate/view/Status.html index 2d91b0b87..af58f3509 100644 --- a/httemplate/view/Status.html +++ b/httemplate/view/Status.html @@ -1,4 +1,7 @@ <& /elements/header.html, 'System Status' &> + +<& /elements/init_overlib.html &> + % foreach my $section ( keys %status ) { <% mt($section) |h %> @@ -11,6 +14,7 @@


% } + <& /elements/footer.html &> <%init> @@ -40,8 +44,13 @@ if ( $db eq 'PostgreSQL' && $db_ver =~ /^\s*PostgreSQL\s+([\w\.]+)\s+on\s+/ ) { my $db_size = 'Unknown'; if ( $db eq 'PostgreSQL' ) { $db_size = FS::Record->scalar_sql(qq( - SELECT pg_size_pretty(pg_database_size('freeside')) - )); + SELECT pg_size_pretty(pg_database_size('freeside')) + )). ' '. + include('/elements/popup_link.html', + 'action' => 'Status-db_size_detail.html', + 'label' => '(details)', + 'actionlabel' => 'Database size details', + ); } tie my %status, 'Tie::IxHash', @@ -112,7 +121,7 @@ if ( $db eq 'PostgreSQL' ) { && FS::Record->scalar_sql('SHOW archive_mode') eq 'on'; my $slave = - FS::Record->scalar_sql('SHOW archive_command') =~ / postgres\@([\w\.\-]+): / + FS::Record->scalar_sql('SHOW archive_command') =~ / postgres\@([\w\.\-]+):/ ? $1 : ''; $status{'Replication'} = [ @@ -132,11 +141,11 @@ if ( $db eq 'PostgreSQL' ) { # http://www.keithf4.com/monitoring_streaming_slave_lag/ # except pg_stat_replication still doesn't fill in the columns we need as # non-Pg user :/ - push @{ $status{'Replication'} }, - { 'title' => 'Slave', - 'value' => $slave || '(Missing, or unparseable archive_command)', - }, - ; + #push @{ $status{'Replication'} }, + # { 'title' => 'Slave', + # 'value' => $slave || '(Missing, or unparseable archive_command)', + # }, + #; } } @@ -228,7 +237,8 @@ foreach my $agent ( }) ) { my $gateway = $agent->payment_gateway('method'=>'VISA card', 'nofatal'=>1, ); - next unless $gateway->gateway_namespace eq 'Business::OnlinePayment'; + next unless $gateway + && $gateway->gateway_namespace eq 'Business::OnlinePayment'; eval "use Business::OnlinePayment"; die $@ if $@; #die? my $bop = new Business::OnlinePayment( $gateway->gateway_module,