r3113 - people/goneri/SvnBuildStat-WWW/script

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-06-29 09:19:02 +0000 (Fri, 29 Jun 2007)
New Revision: 3113

Modified:
   people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
Log:
some bug fixes


Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl	2007-06-29 09:14:39 UTC (rev 3112)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db.pl	2007-06-29 09:19:02 UTC (rev 3113)
@@ -6,6 +6,7 @@
 use LWP::UserAgent;
 use Data::Dumper;
 use File::Basename;
+use Time::Local;
 
 use threads;
 use threads::shared;
@@ -16,11 +17,10 @@
 use SvnBuildStat::Schema;
 use SvnBuildStat::Config;
 
-
 my $config;
 my $schema;
 
-my $poolImportPkg : shared;
+my $poolImportPkg;
 
 sub getRev {
   my $uri = shift;
@@ -272,13 +272,20 @@
   print "Repository: ".$$repository->name."\n";
   my $t = 'svn ls -R '.$$repository->uri;
   my $rev = getRev($$repository->uri);
-  return unless $rev;
+  if(! $rev) {
+    print "Failed to get the current revision of ".$$repository->name."\n";
+    return;
+  }
+
   if ($$repository->rev eq $rev && $$repository->lastcheck) {
     # If he repository is up to date, a still do a refresh every 48h
     # this because the tarball check
     my ($year, $mon, $day, $hour, $min, $sec) = ($$repository->lastcheck =~ /(\d{4})-(\d{2})-(\d{2})\ (\d{1,2}):(\d{2}):(\d{2})/);
     my $lastbuild = timelocal($sec, $min, $hour, $day, $mon, $year);
-    return if $lastbuild > time - 3600*48;
+    if ($lastbuild > time - 3600*48) {
+      print "No need to refresh ".$$repository->name."\n";
+      return;
+    }
   }
 
   my @uri;
@@ -294,10 +301,9 @@
     $uri =~ s/(|\/)debian\/control$//;
     push @uri, $uri;
   }
-
+print "Yo!\n";
   foreach my $uri (@uri) {
     # look for packages
-    print "->".$uri."\n";
     $poolImportPkg->add($repository,$uri,$tarballonrepository) or die "Fucked\n";
   }
 
@@ -311,8 +317,8 @@
 ########## THREAD POOLS #####
 $poolImportPkg = Thread::Pool::Simple->new(
    min => 5,
-   max => 7,
-   load => 10,
+   max => 10,
+   load => 3,
    do => [\&importPkg],
    lifespan => 1
  );
@@ -322,6 +328,6 @@
 # Import packages
 my $repository_rs = $schema->resultset('Repository')->search({enabled => 'true'});
 while (my $repository = $repository_rs->next) {
-  importRepository(\$repository) or die "Fucked\n";
+  importRepository(\$repository) or warn "importRepository failed for ".$repository->name."\n";
 }
 $poolImportPkg->join;