projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do non blocking connects
[spider.git]
/
perl
/
DXLog.pm
diff --git
a/perl/DXLog.pm
b/perl/DXLog.pm
index c699413717534370ae4ab60536f75b1b8427931a..03dc42843ab162051bb19cac2eabaf78ed2f86bb 100644
(file)
--- a/
perl/DXLog.pm
+++ b/
perl/DXLog.pm
@@
-27,13
+27,13
@@
package DXLog;
require Exporter;
@ISA = qw(Exporter);
require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(Log);
+@EXPORT = qw(Log
Logclose
);
-use
FileHand
le;
+use
IO::Fi
le;
use DXVars;
use DXVars;
-use DXDebug ();
use DXUtil;
use Julian;
use DXUtil;
use Julian;
+
use Carp;
use strict;
use Carp;
use strict;
@@
-53,7
+53,7
@@
sub new
$ref->{'sort'} = $sort;
# make sure the directory exists
$ref->{'sort'} = $sort;
# make sure the directory exists
- mkdir($ref->{prefix}, 0777)
if !
-e $ref->{prefix};
+ mkdir($ref->{prefix}, 0777)
unless
-e $ref->{prefix};
return bless $ref;
}
return bless $ref;
}
@@
-66,9
+66,6
@@
sub open
if (defined $mode) {
my $dir = "$self->{prefix}/$year";
mkdir($dir, 0777) if ! -e $dir;
if (defined $mode) {
my $dir = "$self->{prefix}/$year";
mkdir($dir, 0777) if ! -e $dir;
- $self->{mode} = $mode;
- } else {
- delete $self->{mode};
}
$self->{fn} = sprintf "$self->{prefix}/$year/%02d", $thing if $self->{'sort'} eq 'm';
}
$self->{fn} = sprintf "$self->{prefix}/$year/%02d", $thing if $self->{'sort'} eq 'm';
@@
-76,7
+73,9
@@
sub open
$self->{fn} .= ".$self->{suffix}" if $self->{suffix};
$mode = 'r' if !$mode;
$self->{fn} .= ".$self->{suffix}" if $self->{suffix};
$mode = 'r' if !$mode;
- my $fh = new FileHandle $self->{fn}, $mode;
+ $self->{mode} = $mode;
+
+ my $fh = new IO::File $self->{fn}, $mode, 0666;
return undef if !$fh;
$fh->autoflush(1) if $mode ne 'r'; # make it autoflushing if writable
$self->{fh} = $fh;
return undef if !$fh;
$fh->autoflush(1) if $mode ne 'r'; # make it autoflushing if writable
$self->{fh} = $fh;
@@
-84,7
+83,7
@@
sub open
$self->{year} = $year;
$self->{thing} = $thing;
$self->{year} = $year;
$self->{thing} = $thing;
-
DXDebug::dbg("dxlog", "opening $self->{fn}\n");
+
#
DXDebug::dbg("dxlog", "opening $self->{fn}\n");
return $self->{fh};
}
return $self->{fh};
}
@@
-162,8
+161,14
@@
sub close
{
my $self = shift;
undef $self->{fh}; # close the filehandle
{
my $self = shift;
undef $self->{fh}; # close the filehandle
- delete $self->{fh};
- delete $self->{mode};
+ delete $self->{fh};
+}
+
+sub DESTROY
+{
+ my $self = shift;
+ undef $self->{fh}; # close the filehandle
+ delete $self->{fh} if $self->{fh};
}
# log something in the system log
}
# log something in the system log
@@
-176,10
+181,8
@@
sub Log
$log->writeunix($t, join('^', $t, @_) );
}
$log->writeunix($t, join('^', $t, @_) );
}
-sub
DESTROY # catch undefs and do what is required further down the tre
e
+sub
Logclos
e
{
{
- my $self = shift;
- DXDebug::dbg("dxlog", "closing $self->{fn}\n");
- undef $self->{fh} if defined $self->{fh};
-}
+ $log->close();
+}
1;
1;