summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/cust_pkg.pm19
-rw-r--r--FS/FS/cust_svc.pm150
-rw-r--r--FS/FS/part_svc.pm15
-rw-r--r--FS/FS/svc_acct.pm15
4 files changed, 104 insertions, 95 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4373f5bcc..232b6d6cc 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -512,17 +512,11 @@ sub seconds_since {
}
-=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END DATASRC DB_USERNAME DB_PASSWORD
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END
Returns the numbers of seconds all accounts (see L<FS::svc_acct>) in this
package have been online between TIMESTAMP_START (inclusive) and TIMESTAMP_END
-(exclusive), according to an external SQL radacct table, such as those
-generated by ICRADIUS or FreeRADIUS. Sessions which started in the specified
-range but are still open are counted from session start to the end of the
-range. Also, sessions which end in the range but started earlier are counted
-from the start of the range to session end. Finally, sessions which start
-before the range but end after (or are still open) are counted for the entire
-range.
+(exclusive).
TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
L<perlfunc/"time">. Also see L<Time::Local> and L<Date::Parse> for conversion
@@ -532,17 +526,14 @@ functions.
=cut
sub seconds_since_sqlradacct {
- my($self, $start, $end, $datasrc, $db_user, $db_pass) = @_;
-
- my $dbh = DBI->connect($datasrc, $db_user, $db_pass)
- or die "can't connect to $datasrc: ". $DBI::errstr;
+ my($self, $start, $end) = @_;
my $seconds = 0;
foreach my $cust_svc (
grep { $_->part_svc->svcdb eq 'svc_acct' } $self->cust_svc
) {
- $seconds += $cust_svc->seconds_since_sqlradacct($start, $end, $dbh);
+ $seconds += $cust_svc->seconds_since_sqlradacct($start, $end);
}
$seconds;
@@ -731,7 +722,7 @@ sub order {
=head1 VERSION
-$Id: cust_pkg.pm,v 1.23.4.2 2002-10-14 06:17:16 ivan Exp $
+$Id: cust_pkg.pm,v 1.23.4.3 2002-10-17 14:16:20 ivan Exp $
=head1 BUGS
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index ee7c34ee9..78087e9ec 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -13,6 +13,7 @@ use FS::svc_acct_sm;
use FS::svc_domain;
use FS::svc_forward;
use FS::domain_record;
+use FS::part_export;
@ISA = qw( FS::Record );
@@ -340,93 +341,108 @@ sub seconds_since {
$sth->fetchrow_arrayref->[0];
}
-=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END ( DBI_DATABASE_HANDLE | DATASRC DB_USERNAME DB_PASSWORD )
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END
See L<FS::svc_acct/seconds_since_sqlradacct>. Equivalent to
$cust_svc->svc_x->seconds_since, but more efficient. Meaningless for records
where B<svcdb> is not "svc_acct".
-NOTE: specifying a DATASRC/USERNAME/PASSWORD instead of a DBI database handle
-is not yet implemented.
-
=cut
#note: implementation here, POD in FS::svc_acct
sub seconds_since_sqlradacct {
- my($self, $start, $end, $dbh) = @_;
+ my($self, $start, $end) = @_;
my $username = $self->svc_x->username;
-
- #select a unix time conversion function based on database type
- my $str2time;
- if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
- $str2time = 'UNIX_TIMESTAMP(';
- } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
- $str2time = 'EXTRACT( EPOCH FROM ';
- } else {
- warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
- "; guessing how to convert to UNIX timestamps";
- $str2time = 'extract(epoch from ';
+
+ my @part_export = $self->part_svc->part_export('sqlradius')
+ or die "no sqlradius export configured for this service type";
+ #or return undef;
+
+ my $seconds = 0;
+ foreach my $part_export ( @part_export ) {
+
+ my $dbh = DBI->connect( map { $part_export->option($_) }
+ qw(datasrc username password) )
+ or die "can't connect to sqlradius database: ". $DBI::errstr;
+
+ #select a unix time conversion function based on database type
+ my $str2time;
+ if ( $dbh->{Driver}->{Name} eq 'mysql' ) {
+ $str2time = 'UNIX_TIMESTAMP(';
+ } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) {
+ $str2time = 'EXTRACT( EPOCH FROM ';
+ } else {
+ warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
+ "; guessing how to convert to UNIX timestamps";
+ $str2time = 'extract(epoch from ';
+ }
+
+ #find closed sessions completely within the given range
+ my $sth = $dbh->prepare("SELECT SUM(acctsessiontime)
+ FROM radacct
+ WHERE UserName = ?
+ AND $str2time AcctStartTime) >= ?
+ AND $str2time AcctStopTime ) < ?
+ AND AcctStopTime =! 0
+ AND AcctStopTime IS NOT NULL"
+ ) or die $dbh->errstr;
+ $sth->execute($username, $start, $end) or die $sth->errstr;
+ my $regular = $sth->fetchrow_arrayref->[0];
+
+ #find open sessions which start in the range, count session start->range end
+ $sth = $dbh->prepare("SELECT SUM( ? - $str2time AcctStartTime ) )
+ FROM radacct
+ WHERE UserName = ?
+ AND $str2time AcctStartTime ) >= ?
+ AND ( ? - $str2time AcctStartTime ) < 86400
+ AND ( AcctStopTime = 0
+ OR AcctStopTime IS NULL )"
+ ) or die $dbh->errstr;
+ $sth->execute($end, $username, $start, $end) or die $sth->errstr;
+ my $start_during = $sth->fetchrow_arrayref->[0];
+
+ #find closed sessions which start before the range but stop during,
+ #count range start->session end
+ $sth = $dbh->prepare("SELECT SUM( $str2time AcctStopTime ) - ? )
+ FROM radacct
+ WHERE UserName = ?
+ AND $str2time AcctStartTime ) < ?
+ AND $str2time AcctStopTime ) >= ?
+ AND $str2time AcctStopTime ) < ?
+ AND AcctStopTime != 0
+ AND AcctStopTime IS NOT NULL"
+ ) or die $dbh->errstr;
+ $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr;
+ my $end_during = $sth->fetchrow_arrayref->[0];
+
+ #find closed (not anymore - or open) sessions which start before the range
+ # but stop after, or are still open, count range start->range end
+ # don't count open sessions (probably missing stop record)
+ $sth = $dbh->prepare("SELECT COUNT(*)
+ FROM radacct
+ WHERE UserName = ?
+ AND $str2time AcctStartTime ) < ?
+ AND ( $str2time AcctStopTime ) >= ?
+ )"
+ # OR AcctStopTime = 0
+ # OR AcctStopTime IS NULL )"
+ ) or die $dbh->errstr;
+ $sth->execute($username, $start, $end ) or die $sth->errstr;
+ my $entire_range = ($end-$start) * $sth->fetchrow_arrayref->[0];
+
+ $seconds += $regular + $end_during + $start_during + $entire_range;
}
- #find sessions completely within the given range
- my $sth = $dbh->prepare("SELECT SUM(acctsessiontime)
- FROM radacct
- WHERE UserName = ?
- AND $str2time AcctStartTime) >= ?
- AND $str2time AcctStopTime ) < ?
- AND AcctStopTime =! 0
- AND AcctStopTime IS NOT NULL"
- ) or die $dbh->errstr;
- $sth->execute($username, $start, $end) or die $sth->errstr;
- my $regular = $sth->fetchrow_arrayref->[0];
-
- #find open sessions which start in the range, count session start->range end
- $sth = $dbh->prepare("SELECT SUM( ? - $str2time AcctStartTime ) )
- FROM radacct
- WHERE UserName = ?
- AND AcctStartTime >= ?
- AND ( AcctStopTime = 0
- OR AcctStopTime IS NULL )"
- ) or die $dbh->errstr;
- $sth->execute($end, $username, $start) or die $sth->errstr;
- my $start_during = $sth->fetchrow_arrayref->[0];
-
- #find closed sessions which start before the range but stop during,
- #count range start->session end
- $sth = $dbh->prepare("SELECT SUM( $str2time AcctStopTime ) - ? )
- FROM radacct
- WHERE UserName = ?
- AND AcctStartTime < ?
- AND AcctStopTime >= ?
- AND AcctStopTime < ?
- AND AcctStopTime != 0
- AND AcctStopTime IS NOT NULL"
- ) or die $dbh->errstr;
- $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr;
- my $end_during = $sth->fetchrow_arrayref->[0];
-
- #find closed or open sessions which start before the range but stop
- # after, or are still open, count range start->range end
- $sth = $dbh->prepare("SELECT COUNT(*)
- FROM radacct
- WHERE UserName = ?
- AND AcctStartTime < ?
- AND ( AcctStopTime >= ?
- OR AcctStopTime = 0
- OR AcctStopTime IS NULL )"
- ) or die $dbh->errstr;
- $sth->execute($username, $start, $end ) or die $sth->errstr;
- my $entire_range = ($end-$start) * $sth->fetchrow_arrayref->[0];
+ $seconds;
- $regular + $end_during + $start_during + $entire_range;
}
=back
=head1 VERSION
-$Id: cust_svc.pm,v 1.15.4.1 2002-10-12 13:26:44 ivan Exp $
+$Id: cust_svc.pm,v 1.15.4.2 2002-10-17 14:16:20 ivan Exp $
=head1 BUGS
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 959a3f887..552019acb 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -311,22 +311,23 @@ sub all_part_svc_column {
qsearch('part_svc_column', { 'svcpart' => $self->svcpart } );
}
-=item part_export
+=item part_export [ EXPORTTYPE ]
+
+Returns all exports (see L<FS::part_export>) for this service, or, if an
+export type is specified, only returns exports of the given type.
=cut
sub part_export {
my $self = shift;
- map { qsearchs('part_export', { 'exportnum' => $_->exportnum } ) }
+ my %search;
+ $search{'exporttype'} = shift if @_;
+ map { qsearchs('part_export', { 'exportnum' => $_->exportnum, %search } ) }
qsearch('export_svc', { 'svcpart' => $self->svcpart } );
}
=back
-=head1 VERSION
-
-$Id: part_svc.pm,v 1.13 2002-04-11 22:05:31 ivan Exp $
-
=head1 BUGS
Delete is unimplemented.
@@ -334,7 +335,7 @@ Delete is unimplemented.
The list of svc_* tables is hardcoded. When svc_acct_pop is renamed, this
should be fixed.
-all_part_svc_column and part_export methods should be documented
+all_part_svc_column method should be documented
=head1 SEE ALSO
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c400b2281..5b3264cbc 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -948,16 +948,17 @@ sub seconds_since {
$self->cust_svc->seconds_since(@_);
}
-=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END DATASRC DB_USERNAME DB_PASSWORD
+=item seconds_since_sqlradacct TIMESTAMP_START TIMESTAMP_END
Returns the numbers of seconds this account has been online between
TIMESTAMP_START (inclusive) and TIMESTAMP_END (exclusive), according to an
-external SQL radacct table, such as those generated by ICRADIUS or FreeRADIUS.
-Sessions which started in the specified range but are still open are counted
-from session start to the end of the range. Also, sessions which end in the
-range but started earlier are counted from the start of the range to session
-end. Finally, sessions which start before the range but end after (or are
-still open) are counted for the entire range.
+external SQL radacct table, specified via sqlradius export. Sessions which
+started in the specified range but are still open are countedfrom session
+start to the end of the range (unless they are over 1 day old, in which case
+they are presumed missing their stop record and not counted). Also, sessions
+which end in the range but started earlier are counted from the start of the
+range to session end. Finally, sessions which start before the range but end
+after are counted for the entire range.
TIMESTAMP_START and TIMESTAMP_END are specified as UNIX timestamps; see
L<perlfunc/"time">. Also see L<Time::Local> and L<Date::Parse> for conversion
generated by cgit v1.2.1 (git 2.18.0) at 2025-06-24 13:12:10 +0000