Add syslog logging

Based on patch by jajcus

diff --git a/file-fetcher.pl b/file-fetcher.pl
index 173e490a24158cccd8c0969463a48523d1c91e94..55e7c23be41d7b4565bc1de1fd3fab4f992b34cb 100755 (executable)
--- a/file-fetcher.pl
+++ b/file-fetcher.pl
@@ -1,6 +1,10 @@
 #!/usr/bin/perl -w
 use IPC::Run qw(run);
 
+use Sys::Syslog;
+
+openlog("distfiles-ff", "pid", "user"); 
+
 $commits_list = "pld-cvs-commit\@lists.pld-linux.org";
 
 $spool_dir = "./spool";
@@ -22,10 +26,18 @@ $req_login = "nobody";
 $spec = "";
 @files = ();
 
+sub fatal($)
+{
+  my $msg = shift;
+
+  syslog("err","FATAL: $msg");
+  die "$msg";
+}
+
 # try lookup some file in spool, exit if it cannot be done
 sub find_file_in_spool()
 {
-  opendir(DIR, $spool_dir) || die "can't opendir $spool_dir: $!";
+  opendir(DIR, $spool_dir) || fatal("can't opendir $spool_dir: $!");
   while (1) {
     my $f = readdir(DIR);
     defined $f or last;
@@ -43,14 +55,15 @@ sub find_file_in_spool()
 # and @url (map from md5 to urls)
 sub read_spool_file()
 {
+  syslog("info","reading spool file $file");
   open(F, "< $file") || exit 0;
   $requester = <F>;
   chomp $requester;
   $requester =~ /^[a-zA-Z_0-9@.-]+$/
-        or die "$file: evil requester: $requester";
+        or fatal("$file: evil requester: $requester");
   $req_login = "";
   $requester =~ /^([^@]+)\@/ and $req_login = $1;
-  $req_login =~ /^[a-z0-9A-Z_.]+$/ or die "$file: evil requester $requester";
+  $req_login =~ /^[a-z0-9A-Z_.]+$/ or fatal("$file: evil requester $requester");
   $spec = <F>;
   chomp $spec;
   $spec =~ s/\.spec$//;
@@ -106,7 +119,7 @@ sub copy_to_df($$)
 {
   my ($from, $to) = @_;
   my $cmd = "scp -pr -B -q $from $df_scp/$to";
-  open(E, "$cmd 2>&1 |") or die;
+  open(E, "$cmd 2>&1 |") or fatal("$cmd failed");
   my $oops = "";
   while (<E>) {
     $oops .= $_;
@@ -115,6 +128,7 @@ sub copy_to_df($$)
     unless (close (E));
   $problems .= "scp problems: $cmd:\n$oops\n"
     if ($oops ne "");
+  syslog("err","copy_to_df oops for '$cmd': $oops") if ($oops ne "");
   return ($oops ne "");
 }
 
@@ -232,6 +246,8 @@ sub fetch_file($$)
   my @cmd2 = ("wget",  "-nv", "--no-check-certificate", "--user-agent=$user_agent", "--passive-ftp", "-O", $local, $url);
   my $cmd2_joined = join(' ', @cmd2);
 
+  syslog("info","fetch_file($md5,$url)");
+
   push @files, $bn;
 
   if ( $bn =~ m/(%[0-9a-f]{2})/i ) {
@@ -257,10 +273,10 @@ sub fetch_file($$)
   }
 
   my $pid = open(W, "-|");
-  die "Cannot fork $!" unless defined $pid;
+  fatal("Cannot fork $!") unless defined $pid;
   unless ( $pid ) {
-    open STDERR, ">&", \*STDOUT  or die "$0: open: $!";
-    exec { $cmd[0] } @cmd or die "$0: exec: $!";
+    open STDERR, ">&", \*STDOUT  or fatal("$0: open: $!");
+    exec { $cmd[0] } @cmd or fatal("$0: exec: $!");
   }
   while (<W>) {
     $all_out .= $_;
@@ -269,6 +285,7 @@ sub fetch_file($$)
   }
   close(W);
   if ($out ne "") {
+    syslog("err","$cmd_joined: $out");
     $problems .= "$cmd_joined:\n$out\n\n";
   }
   if ( $? ) {
@@ -280,10 +297,10 @@ sub fetch_file($$)
   if (-f $local && -s $local == 0 && $url =~ /^ftp:/) {
     $out = "";
     my $pid = open(W, "-|");
-    die "Cannot fork $!" unless defined $pid;
+    fatal("Cannot fork $!") unless defined $pid;
     unless ( $pid ) {
-      open STDERR, ">&", \*STDOUT  or die "$0: open: $!";
-      exec { $cmd2[0] } @cmd2 or die "$0: exec: $!";
+      open STDERR, ">&", \*STDOUT  or fatal("$0: open: $!");
+      exec { $cmd2[0] } @cmd2 or fatal("$0: exec: $!");
     }
     while (<W>) {
       $all_out .= "\n\t\t$_";
@@ -309,7 +326,7 @@ sub fetch_file($$)
       my $testcmd = "file \"$local\" |";
       my $testres = "";
       if ($url =~ /^(http|https):/ && $local =~ /\.(tar\.(bz2|gz)|tgz|zip|jar|xpi)$/) {
-        open(T, $testcmd) or die;
+        open(T, $testcmd) or fatal("$testcmd failed");
         $testres = <T>;
         close(T);
       }
@@ -341,6 +358,7 @@ sub fetch_files()
 
 sub send_email()
 {
+  syslog("info","sending email to $requester");
   open(EMAIL, "| /usr/sbin/sendmail -t");
   #open(EMAIL, "| cat");
   my $marker = "";
@@ -370,7 +388,7 @@ $normal_out
 -- 
 Virtually Yours: distfiles.
 ";
-  close(EMAIL) or die;
+  close(EMAIL) or fatal("close() failed");
 }
 
 sub make_tmp_dir()
@@ -379,7 +397,7 @@ sub make_tmp_dir()
   chomp $id;
   $id = rand if (!defined $id or $id eq "");
   $tmp_dir = "./tmp/$id";
-  mkdir($tmp_dir) or die;
+  mkdir($tmp_dir) or fatal("mkdir($tmp_dir) failed");
 }
 
 sub clean_tmp_dir()

diff --git a/request-handler.pl b/request-handler.pl
index 3b3bfab8fdb117588e4910b968cd2f94152342fd..347233e9b5b2e7ef1b80e27a7171bc5c24cfb97b 100755 (executable)
--- a/request-handler.pl
+++ b/request-handler.pl
@@ -1,6 +1,10 @@
 #!/usr/bin/perl -w
 # read email with request from stdin and process it
 
+use Sys::Syslog;
+
+openlog("distfiles-rh", "pid", "user"); 
+
 $spool_dir = "./spool";
 $commits_list = "pld-cvs-commit\@lists.pld-linux.org";
 
@@ -22,6 +26,8 @@ sub cleanup()
 sub report_fatal($)
 {
   my $msg = shift;
+
+  syslog("err","FATAL: $msg");
   cleanup();
   open(M, "| /usr/sbin/sendmail -t") or die("/usr/sbin/sendmail not found");
   #open(M, "| cat") or die;
@@ -59,7 +65,12 @@ while (<STDIN>) {
   /^X-Flags: ([a-z0-9_ -]+)/i and $flags = $1;
 }
 
-die "ill-formed request" if (!defined $from);
+if (!defined $from) {
+   syslog("err","FATAL: ill-formed request");
+   die "ill-formed request";
+}
+
+syslog("info","got request from $from for $spec at $branch ($flags)");
 
 report_fatal("bad spec name") if (!defined $spec);
 
@@ -79,6 +90,7 @@ if ( $? ) {
 
 chdir($oldcwd);
 
+syslog("info","spooling to tmp/$id/to-spool");
 open(S, "> tmp/$id/to-spool");
 print S "$from\@pld-linux.org\n";
 print S "$spec\n";
@@ -89,7 +101,10 @@ if (system("perl ./specparser.pl \"tmp/$id/$spec\" tmp/$id/sources >> tmp/$id/to
   report_fatal("cannot parse $spec ($branch)")
 }
 
-File::Copy::move("tmp/$id/to-spool", "$spool_dir/$id") or die("move failed: $!");
+if (!File::Copy::move("tmp/$id/to-spool", "$spool_dir/$id")) {
+  syslog("err","FATAL: move failed: $!");
+  die("move failed: $!");
+}
 
 cleanup();