X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-mail.pl;h=841d4eea4ac38248fa73126d57939031515e5ba9;hb=156fd1c31592b821c170b5567b2fc81060359232;hp=46763f3ec98a51b8491116e843cf7f6e499ebd57;hpb=556f51f104fbbb5bd0d51b61a18d7e5af2759079;p=onak.git

diff --git a/onak-mail.pl b/onak-mail.pl
index 46763f3..841d4ee 100755
--- a/onak-mail.pl
+++ b/onak-mail.pl
@@ -7,6 +7,8 @@
 # Copyright 2002 Project Purple
 # Released under the GPL.
 #
+# $Id: onak-mail.pl,v 1.7 2003/09/28 17:25:40 noodles Exp $
+#
 
 use strict;
 use IPC::Open3;
@@ -29,10 +31,14 @@ sub readconfig {
 			# Ignore; comment line.
 		} elsif (/^this_site (.*)/) {
 			$config{'thissite'} = $1;
+		} elsif (/^logfile (.*)/) {
+			$config{'logfile'} = $1;
 		} elsif (/^maintainer_email (.*)/) {
 			$config{'adminemail'} = $1;
 		} elsif (/^mail_delivery_client (.*)/) {
 			$config{'mta'} = $1;
+		} elsif (/^pks_bin_dir (.*)/) {
+			$config{'pks_bin_dir'} = $1;
 		} elsif (/^syncsite (.*)/) {
 			push @{$config{'syncsites'}}, $1;
 		}
@@ -55,16 +61,12 @@ sub submitupdate {
 	my (@errors, @mergedata);
 
 	open3(\*MERGEIN, \*MERGEOUT, \*MERGEERR,
-		"/home/noodles/onak-0.0.3/onak", "-u", "add");
+		$config{'pks_bin_dir'}."/onak", "-u", "add");
 
 	print MERGEIN @data;
 	close MERGEIN;
-	@errors = <MERGEERR>;
 	@mergedata = <MERGEOUT>;
-
-	open (LOG, ">>/home/noodles/onak-0.0.3/keyadd.log");
-	print LOG "[".localtime(time)."] ", @errors;
-	close LOG;
+	@errors = <MERGEERR>;
 
 	return @mergedata;
 }
@@ -102,6 +104,7 @@ if ($subject =~ /^INCREMENTAL$/i) {
 	my $count;
 	my $i;
 	my @newupdate = submitupdate(@body);
+	my @time;
 
 	$count = 0;
 	foreach $i (@{$config{'syncsites'}}) {
@@ -110,13 +113,22 @@ if ($subject =~ /^INCREMENTAL$/i) {
 		}
 	}
 
-	open (LOG, ">>/home/noodles/logs/keyadd.log");
-	print LOG "[".localtime(time)."] Syncing with $count sites.\n";
+	open (LOG, ">>$config{'logfile'}");
+	@time = localtime(time);
+	print LOG "[";
+	print LOG sprintf "%02d/%02d/%04d %02d:%02d:%02d",
+		$time[3], $time[4] + 1, $time[5] + 1900,
+		$time[2], $time[1], $time[0];
+	print LOG "] onak-mail[$$]: Syncing with $count sites.\n";
 	close LOG;
 
-	if ($newupdate[0] eq '') {
-		open (LOG, ">>/home/noodles/logs/keyadd.log");
-		print LOG "[".localtime(time)."] Nothing to sync.\n";
+	if ((! defined($newupdate[0])) || $newupdate[0] eq '') {
+		open (LOG, ">>$config{'logfile'}");
+		print LOG "[";
+		print LOG sprintf "%02d/%02d/%04d %02d:%02d:%02d",
+			$time[3], $time[4] + 1, $time[5] + 1900,
+			$time[2], $time[1], $time[0];
+		print LOG "] onak-mail[$$]: Nothing to sync.\n";
 		close LOG;
 		$count = 0;
 	}