use File::Slurp qw(slurp);
use Date::Format;
use XML::Simple;
+use FS::Record qw(qsearch qsearchs dbh);
use FS::svc_port;
-use FS::Record qw(qsearch);
+use FS::torrus_srvderive_component;
use Torrus::ConfigTree;
#$DEBUG = 0;
# hardcoded for 'main' tree for now
my $self = shift;
my $serviceid = shift;
- my $hash = $self->get_router_serviceids(undef,$serviceid);
+ my $hash = $self->get_router_serviceids(undef,$serviceid) or return '';
my @keys = keys %$hash; # yeah this is weird...
my $host = $keys[0];
my $iface = $hash->{$keys[0]};
return $svc_port[0];
}
+sub find_torrus_srvderive_component {
+ my $self = shift;
+ my $serviceid = shift;
+ return '' unless $serviceid =~ /^[0-9A-Za-z_\-.\\\/ ]+$/;
+
+ qsearchs('torrus_srvderive_component', { 'serviceid' => $serviceid });
+}
+
+sub report {
+ my $self = shift;
+
+ my @ls = localtime(time);
+ my ($d,$m,$y) = ($ls[3], $ls[4]+1, $ls[5]+1900);
+ if ( $ls[3] == 1 ) {
+ $m--;
+ if ($m == 0) { $m=12; $y-- }
+ #i should have better error checking
+ system('torrus', 'report', '--report=MonthlyUsage', "--date=$y-$m-01");
+ system('torrus', 'report', '--genhtml', '--tree=main');
+ }
+
+}
+
sub add_router {
my($self, $ip) = @_;
sub add_interface {
my($self, $router_ip, $interface, $serviceid ) = @_;
- $interface =~ s(\/)(_)g;
+ $interface =~ s(\/)(_)g; #slashes become underscores
+ $interface =~ s(\.)(_)g; #periods too, huh
#should just use a proper XML parser huh
+ my @ddx = split(/\n/, $self->_torrus_loadddx);
+
+ die "Torrus Service ID $serviceid in use\n"
+ if grep /^\s*$serviceid:/, @ddx;
+
my $newline = " $serviceid:$interface:Both:main,";
- my @ddx = split(/\n/, $self->_torrus_loadddx);
my $new = '';
my $added = 0;
while ( my $paramline = shift(@ddx) ) {
if ( $paramline =~ /^\s*<\/param>/ ) {
- $new .= "$newline\n$paramline";
+ $new .= "$newline\n$paramline\n";
last; #paramline
} else {
- $new .= $paramline;
+ $new .= "$paramline\n";
}
}
qq( $newline\n").
qq( </param>\n);
}
- $new .= $hostline;
+ $new .= "$hostline\n";
last; #hostline
}
print $new $ddx;
close $new;
- # `date ...` created file names with weird chars in them
my $tmpname = $ddxfile . Date::Format::time2str('%Y%m%d%H%M%S',time);
rename("$ddxfile", $tmpname) or die $!;
rename("$ddxfile.new", $ddxfile) or die $!;
sub _torrus_reload {
my($self) = @_;
- #i should have better error checking
+ #i should use IPC::Run and have better error checking (commands are silent
+ # for success, or output errors)
system('torrus', 'devdiscover', "--in=$ddxfile");
}
+sub torrus_serviceids {
+ my $self = shift;
+
+ #is this going to get too slow or will the index make it okay?
+ my $sth = dbh->prepare("SELECT DISTINCT(serviceid) FROM srvexport")
+ or die dbh->errstr;
+ $sth->execute or die $sth->errstr;
+ my %serviceid = ();
+ while ( my $row = $sth->fetchrow_arrayref ) {
+ my $serviceid = $row->[0];
+ $serviceid =~ s/_(IN|OUT)$//;
+ $serviceid{$serviceid}=1;
+ }
+ my @serviceids = sort keys %serviceid;
+
+ @serviceids;
+
+}
+
1;