Changeset 435

Timestamp:

06/25/12 17:39:09 (12 years ago)

Author:

nanardon

Message:

• add iniscript for sophie-update
• sophie-update update also maintainers

Location:

server/trunk/web

Files:

• Makefile.PL (modified) (1 diff)
• Sophie.spec.in (modified) (2 diffs)
• bin/sophie-update (moved) (moved from server/trunk/web/bin/sophie_scan) (5 diffs)
• sysinit (added)
• sysinit/sophie-update (added)

server/trunk/web/Makefile.PL

@@ -43 +43 @@
 
 install_script glob('script/*.pl');
-install_script qw(bin/sophie_fetch_maint bin/sophie_rescan bin/sophie_scan);
+install_script qw(bin/sophie_fetch_maint bin/sophie_rescan bin/sophie-update);
 
 WriteMakefile(

server/trunk/web/Sophie.spec.in

@@ -83 +83 @@
 install -m 755 bin/sophie_cron %buildroot/%_sysconfdir/cron.daily/sophie_cron
 
+mkdir -p %buildroot/%_sysconfdir/init.d
+
+install -m 755 sysinit/sophie-scan %buildroot/%_sysconfdir/init.d/sophie-scan
+
 %clean
 rm -rf %buildroot
@@ -91 +95 @@
 %dir %_sysconfdir/sophie
 %_sysconfdir/cron.daily/sophie_cron
+%_sysconfdir/init.d/sophie-scan
 %config(noreplace) %_sysconfdir/sophie/*
 %_bindir/*

server/trunk/web/bin/sophie-update

@@ -5 +5 @@
 use Getopt::Long;
 use Sophie::Scan;
+use Sophie::Base;
 use Sys::Syslog;
 use Pod::Usage;
@@ -18 +19 @@
 require Sophie::Scan::RpmsPath;
 
-sub process {
+sub process_rpms {
     my $scan = Sophie::Scan->new;
     $scan->update_meta_paths;
@@ -54 +55 @@
 }
 
-openlog('sophie-notify', 'ndelay,pid' . ($daemon ? '' : ',perror'), 'user');
+sub process_maint {
+    my $sophie = Sophie::Base->connect;
+
+    foreach my $maintsource (
+        $sophie->resultset('MaintSources')
+        ->search->all) {
+
+        my $realclass = 'Sophie::Maint::' . $maintsource->accessor;
+        no strict qw(refs);
+        eval "require $realclass;";
+        next if($@);
+
+        warn "Updating maintainers for " . $maintsource->label . "\n";
+        my $fetcher = $realclass->new($maintsource);
+        if (my $list = $fetcher->fetch) {
+            $sophie->resultset('MaintRpm')->search(
+                {
+                    sources => $maintsource->pkey,
+                }
+            )->delete;
+
+            foreach (@$list) {
+                $_->{sources} = $maintsource->pkey;
+            }
+
+            $sophie->txn_do(
+                sub {
+                    $sophie->resultset('MaintRpm')->populate($list) &&
+                    $maintsource->update({ lastupdated => 'now()' });
+                }
+            );
+        }
+    }
+}
+
+openlog('sophie-update', 'ndelay,pid' . ($daemon ? '' : ',perror'), 'user');
 $SIG{__WARN__} = sub {
     syslog('warning', @_);
@@ -93 +129 @@
 $sleep ||= 60;
 
+my $lastmaint = 0;
+
 while (1) {
     my $csleep = int(rand($sleep) + ($sleep / 2 ));
@@ -99 +137 @@
         waitpid($pid, 0);
     } else {
-        process();
+        process_rpms();
         exit(0);
     }
+
+    if ($lastmaint < time - ($sleep * 100)) {
+        if (my $pid = fork) {
+            waitpid($pid, 0);
+            $lastmaint = time;
+        } else {
+            process_maint();
+            exit(0);
+        }
+    }
+    
     my $delay = $csleep - (time - $currenttime);