head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2
	RELEASE_9_0_0:1.2
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	PRE_XORG_7:1.2
	RELEASE_4_EOL:1.2
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1
	RELEASE_6_0_0:1.1
	RELEASE_5_4_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.07.10.14.58.27;	author rafan;	state Exp;
branches;
next	1.1;

1.1
date	2005.02.18.10.02.09;	author pav;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Fix syntax error

PR:		99886 [1], 97297
Submitted by:	Oleg Gawriloff <barzog at telecom.by> [1]
Approved by:	maintainer
@
text
@--- amavis-stats.orig	Sat Mar 27 23:25:27 2004
+++ amavis-stats	Mon Jul 10 22:55:19 2006
@@@@ -1,4 +1,4 @@@@
-#! /usr/bin/perl
+#!/usr/bin/perl -w
 #
 # amavis-stats -- generate rrds from amavis log output
 #
@@@@ -28,6 +28,7 @@@@
 # ########################################################################
 use strict;
 use warnings;
+use diagnostics;
 use Getopt::Std;
 use Time::localtime;
 use Time::Local;
@@@@ -83,8 +84,8 @@@@
 $version   = "0.1.12"; # this value is auto-updated by packing system
 $pkg       = "amavis-stats";
 $locale    = "C";
-$lockfile  = "/var/lock/$pkg";
-$statedir  = "/var/lib/$pkg";
+$lockfile  = "/var/tmp/$pkg";
+$statedir  = "/usr/local/www/$pkg";
 $statefile = "$statedir/$pkg.state"; # last read position of the logfile
 $namesfile = "$statedir/$pkg.names"; # stores the virus name to id mappings
 $countfile = "$statedir/$pkg.count"; # per virus totals
@@@@ -212,7 +213,7 @@@@
 sub semlock {
     open (LOCKF, ">$lockfile") or do_exit(1, "Could not open $lockfile: $!");
     unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
-        err("warning: Could not lock $lockfile: $!");
+        print_err("warning: Could not lock $lockfile: $!");
         sleep 2;
         unless (flock(LOCKF, LOCK_EX | LOCK_NB)) {
             do_exit(1, "Could not lock $lockfile: $!");
@@@@ -680,8 +681,8 @@@@
     if (defined($rotlogfile)) {
         parseFile ($rotlogfile, $spos, (stat $rotlogfile)[7]);
     } else {
-        err("Could not open rotated logfile.");
-        err("  Tried extentions .0, .1, .01, -$today, -$yesterday");
+        print_err("Could not open rotated logfile.");
+        print_err("  Tried extentions .0, .1, .01, -$today, -$yesterday");
         do_exit(1);
     }
 }
@@@@ -707,7 +708,7 @@@@
 
     my $err = RRDs::error;
     if ($err) {
-        err("createRRD: $err");
+        print_err("createRRD: $err");
         return -1;
     }
 
@@@@ -736,7 +737,7 @@@@
     $last = RRDs::last($rrdfile);
     $err = RRDs::error;
     if ($err) {
-        err("updateRRD: $err");
+        print_err("updateRRD: $err");
         return -1;
     }
 
@@@@ -750,8 +751,8 @@@@
 
         $err = RRDs::error;
         if ($err) {
-            err("updateRRD: $err");
-            err("Attempted to update $rrdfile at $epoch count $count");
+            print_err("updateRRD: $err");
+            print_err("Attempted to update $rrdfile at $epoch count $count");
             return -1;
         }
     }
@@@@ -769,7 +770,8 @@@@
     print "$me: @@_\n" if ($verbose);
 }
 
-sub err {
+sub print_err
+{
     print STDERR "$me: error: @@_\n";
 }
 
@


1.1
log
@amavis-stats is a simple AMaViS statistics generator based on rrdtool.  It
produces graphs of clean emails, spam emails and infected emails broken down by
virus, from amavis log entries. RRD files are created and updated by a perl
script run from cron. Graphs are generated by a php script and viewed with a
web browser.

PR:		ports/68934
Submitted by:	Mantas Kaulakys <stone@@tainet.lt>
@
text
@d1 17
a17 3
--- amavis-stats.orig  Sat Mar 27 17:25:27 2004
+++ amavis-stats       Sun Jun  6 01:15:27 2004
@@@@ -83,8 +83,8 @@@@
d28 59
@

