View | Details | Raw Unified | Return to bug 99886
Collapse All | Expand All

(-)/usr/local/sbin/amavis-stats (-9 / +11 lines)
Lines 1-4 Link Here
1
#! /usr/bin/perl
1
#!/usr/bin/perl -w
2
#
2
#
3
# amavis-stats -- generate rrds from amavis log output
3
# amavis-stats -- generate rrds from amavis log output
4
#
4
#
Lines 28-33 Link Here
28
# ########################################################################
28
# ########################################################################
29
use strict;
29
use strict;
30
use warnings;
30
use warnings;
31
use diagnostics;
31
use Getopt::Std;
32
use Getopt::Std;
32
use Time::localtime;
33
use Time::localtime;
33
use Time::Local;
34
use Time::Local;
Lines 212-218 Link Here
212
sub semlock {
213
sub semlock {
213
    open (LOCKF, ">$lockfile") or do_exit(1, "Could not open $lockfile: $!");
214
    open (LOCKF, ">$lockfile") or do_exit(1, "Could not open $lockfile: $!");
214
    unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
215
    unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
215
        err("warning: Could not lock $lockfile: $!");
216
        print_err("warning: Could not lock $lockfile: $!");
216
        sleep 2;
217
        sleep 2;
217
        unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
218
        unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
218
            do_exit(1, "Could not lock $lockfile: $!");
219
            do_exit(1, "Could not lock $lockfile: $!");
Lines 680-687 Link Here
680
    if (defined($rotlogfile)) {
681
    if (defined($rotlogfile)) {
681
        parseFile ($rotlogfile, $spos, (stat $rotlogfile)[7]);
682
        parseFile ($rotlogfile, $spos, (stat $rotlogfile)[7]);
682
    } else {
683
    } else {
683
        err("Could not open rotated logfile.");
684
        print_err("Could not open rotated logfile.");
684
        err("  Tried extentions .0, .1, .01, -$today, -$yesterday");
685
        print_err("  Tried extentions .0, .1, .01, -$today, -$yesterday");
685
        do_exit(1);
686
        do_exit(1);
686
    }
687
    }
687
}
688
}
Lines 707-713 Link Here
707
708
708
    my $err = RRDs::error;
709
    my $err = RRDs::error;
709
    if ($err) {
710
    if ($err) {
710
        err("createRRD: $err");
711
        print_err("createRRD: $err");
711
        return -1;
712
        return -1;
712
    }
713
    }
713
714
Lines 736-742 Link Here
736
    $last = RRDs::last($rrdfile);
737
    $last = RRDs::last($rrdfile);
737
    $err = RRDs::error;
738
    $err = RRDs::error;
738
    if ($err) {
739
    if ($err) {
739
        err("updateRRD: $err");
740
        print_err("updateRRD: $err");
740
        return -1;
741
        return -1;
741
    }
742
    }
742
743
Lines 750-757 Link Here
750
751
751
        $err = RRDs::error;
752
        $err = RRDs::error;
752
        if ($err) {
753
        if ($err) {
753
            err("updateRRD: $err");
754
            print_err("updateRRD: $err");
754
            err("Attempted to update $rrdfile at $epoch count $count");
755
            print_err("Attempted to update $rrdfile at $epoch count $count");
755
            return -1;
756
            return -1;
756
        }
757
        }
757
    }
758
    }
Lines 769-775 Link Here
769
    print "$me: @_\n" if ($verbose);
770
    print "$me: @_\n" if ($verbose);
770
}
771
}
771
772
772
sub err {
773
sub print_err
774
{
773
    print STDERR "$me: error: @_\n";
775
    print STDERR "$me: error: @_\n";
774
}
776
}

Return to bug 99886