Changeset 18 for server/trunk/web/bin

Timestamp:

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

Author:

nanardon

Message:

• improve database error management
• add options to command line

File:

• server/trunk/web/bin/sophie_scan (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;