Changeset 18 for server

Timestamp:

11/23/10 00:11:46 (14 years ago)

Author:

nanardon

Message:

• improve database error management
• add options to command line

Location:

server/trunk/web

Files:

• bin/sophie_scan (modified) (4 diffs)
• lib/Sophie.pm (modified) (1 diff)
• lib/Sophie/Base.pm (modified) (2 diffs)
• lib/Sophie/Base/Header.pm (modified) (1 diff)
• lib/Sophie/Base/RpmsPath.pm (modified) (4 diffs)

server/trunk/web/bin/sophie_scan

@@ -7 +7 @@
 use Linux::Inotify2;
 use POSIX ":sys_wait_h";
+use Getopt::Long;
 
-$SIG{ALRM} = sub {};
+GetOptions(
+    'bdelay=i' =>  \my $updated_inotify,
+    'd|daemon'  => \my $daemon,
+) or die "Wrong options";
+
 $SIG{CHLD} = sub { wait };
 
 my %modified_paths;
+my $inotify = undef;
+$updated_inotify ||= 300;
 
+if ($daemon) {
+    if (fork()) {
+        exit(0);
+    }
+}
+
+alarm($updated_inotify);
 while (1) {
-    alarm 30;
+    local $SIG{ALRM} = sub {
+        $inotify = undef;
+        warn "reparse paths";
+        alarm($updated_inotify);
+    };
     if (update_base(keys %modified_paths)) {
         %modified_paths = ();
     }
-    my $inotify = inotify_path();
+    $inotify ||= inotify_path();
     $inotify->poll;
 }
@@ -35 +53 @@
                 warn $e->w->name;
                 $modified_paths{$e->w->name} = 1;
+                1;
             }
         )
@@ -53 +72 @@
     my @pkey;
     {
-        my $sophie = Sophie::Base->connect;
+        my $sophie = Sophie::Base->connect or do {
+            die "cannot read config file\n";
+        };
         @pkey = $sophie->resultset('Paths')->search(
             path => [ @path ],
@@ -100 +121 @@
         }
         1 while(waitpid(-1, 0) <= 0);
+        exit(0);
     }
     return 1;

server/trunk/web/lib/Sophie.pm

@@ -20 +20 @@
     Session::State::Cookie
     Compress::Zlib
-    Server
-    Server::XMLRPC
     Authentication
 /;

server/trunk/web/lib/Sophie/Base.pm

@@ -5 +5 @@
 use DBI;
 use base qw/DBIx::Class::Schema/;
+use FindBin qw($Bin);
 
 __PACKAGE__->load_namespaces();
@@ -17 +18 @@
 sub db {
    my ($self) = @_;
-   require Sophie;
+   require Config::General;
+   my $cg = Config::General->new("$Bin/../sophie.conf");
+   my $config = { $cg->getall() };
 
    DBI->connect_cached(
-       'dbi:Pg:' . Sophie->config->{dbconnect},
-       Sophie->config->{dbuser},
-       Sophie->config->{dbpassword},
+       'dbi:Pg:' . $config->{dbconnect},
+       $config->{dbuser},
+       $config->{dbpassword},
        {
            AutoCommit => 0,

server/trunk/web/lib/Sophie/Base/Header.pm

@@ -104 +104 @@
 
     $tmp = undef;
+    return 1;
 }
 

server/trunk/web/lib/Sophie/Base/RpmsPath.pm

@@ -113 +113 @@
         }
     );
-    $remove->execute($$self, $rpm);
-    warn "deleting $rpm";
-    $self->db->commit;
+    for (1 .. 3) {
+        if ($remove->execute($$self, $rpm)) { 
+            warn "deleting $rpm";
+            $self->db->commit;
+            return 1;
+        }
+        $self->db->rollback;
+    }
 }
 
@@ -121 +126 @@
     my ($self, $rpm) = @_;
 
-    if (my $pkgid = $self->_add_header($rpm)) {
-        my $register = $self->db->prepare_cached(
-            q{
-            INSERT INTO rpmfiles (d_path, filename, pkgid)
-            values (?,?,?)
+    for (1 .. 3) {
+        if (defined(my $pkgid = $self->_add_header($rpm))) {
+            $pkgid or return;
+            my $register = $self->db->prepare_cached(
+                q{
+                INSERT INTO rpmfiles (d_path, filename, pkgid)
+                values (?,?,?)
+                }
+            );
+            if ($register->execute($$self, $rpm, $pkgid)) {
+                warn "adding $rpm";
+                $self->db->commit;
+                return;
             }
-        );
-        $register->execute($$self, $rpm, $pkgid);
-
-    } else {
-    }
-    warn "adding $rpm";
-    $self->db->commit;
+
+        }
+        $self->db->rollback;
+    }
 }
 
@@ -145 +155 @@
     $header or do {
         warn "Cannot read " . $self->path . '/' . $rpm;
-        return;
+        return "";
     };
 
@@ -197 +207 @@
         }
     );
-    $index_tag->execute($header->queryformat('%{PKGID}'));
+    $index_tag->execute($header->queryformat('%{PKGID}')) or return;
     $index_tag->finish;
     Sophie::Base::Header->new($header->queryformat('%{PKGID}'))
-        ->addfiles_content({ path => $self->path, filename => $rpm});
+        ->addfiles_content({ path => $self->path, filename => $rpm}) or return;
 
     $header->queryformat('%{PKGID}');