diff options
| -rw-r--r-- | FS/FS/part_export/http_status.pm | 6 | ||||
| -rw-r--r-- | FS/FS/svc_Common.pm | 20 |
2 files changed, 23 insertions, 3 deletions
diff --git a/FS/FS/part_export/http_status.pm b/FS/FS/part_export/http_status.pm index 08be3a0..2d15231 100644 --- a/FS/FS/part_export/http_status.pm +++ b/FS/FS/part_export/http_status.pm @@ -1,8 +1,9 @@ -packages FS::part_export::http_status; +package FS::part_export::http_status; use base qw( FS::part_export ); use strict; use warnings; +use vars qw( %info ); use LWP::UserAgent; use HTTP::Request::Common; @@ -29,7 +30,7 @@ sub export_getstatus { my $url = $self->option('url'); { no strict 'refs'; - ${$_} = $svc_x->getfield($x) foreach $svc_x->fields; + ${$_} = $svc_x->getfield($_) foreach $svc_x->fields; $url = eval(qq($url)); } @@ -41,7 +42,6 @@ sub export_getstatus { $$htmlref = $response->is_error ? $response->error_as_HTML : $response->content; - #hash data note yet implemented for this status export } diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm index e83d96e..28f759a 100644 --- a/FS/FS/svc_Common.pm +++ b/FS/FS/svc_Common.pm @@ -995,6 +995,26 @@ sub export_getsettings { ( \%settings, \%defaults ); } +=item export_getstatus + +Runs export_getstatus callbacks and returns a two item list consisting of an +HTML status and a status hashref. + +=cut + +sub export_getstatus { + my $self = shift; + my $html = ''; + my %hash = (); + my $error = $self->export('getstatus', \$html, \%hash); + if ( $error ) { + #XXX bubble this up better + warn "error running export_getstatus: $error"; + return ( '', {} ); + } + ( $html, \%hash ); +} + =item export HOOK [ EXPORT_ARGS ] Runs the provided export hook (i.e. "suspend", "unsuspend") for this service. |