Changeset 434

Timestamp:

06/25/12 16:55:47 (12 years ago)

Author:

nanardon

Message:

• sophie-scan can run as daemon

Location:

server/trunk/web

Files:

• bin/sophie_scan (modified) (1 diff)
• lib/Sophie/Controller/Admin.pm (modified) (1 diff)
• lib/Sophie/Controller/Admin/Cli.pm (added)
• lib/Sophie/Model/Help/POD.pm (modified) (1 diff)
• lib/Sophie/Scan/RpmsPath.pm (modified) (5 diffs)
• t/controller_Admin-Cli.t (added)

server/trunk/web/bin/sophie_scan

@@ -5 +5 @@
 use Getopt::Long;
 use Sophie::Scan;
+use Sys::Syslog;
+use Pod::Usage;
+
+GetOptions(
+    'd' => \my $daemon,
+    'sleep=i' => \my $sleep,
+    'runas=s' => \my $runas,
+    'pidfile=s' => \my $pidfile,
+) or do { pod2usage(1) };
 
 $ENV{LC_ALL} = 'C';
 require Sophie::Scan::RpmsPath;
 
-my $scan = Sophie::Scan->new;
-$scan->update_meta_paths;
+sub process {
+    my $scan = Sophie::Scan->new;
+    $scan->update_meta_paths;
 
-my @pkey = $scan->list_unscanned_paths;
+    my @pkey = $scan->list_unscanned_paths;
 
-foreach my $pathkey (@pkey) {
-    
-    my $time = time;
-    my $mark = 0;
-    my @delta;
+    foreach my $pathkey (@pkey) {
+        
+        my $time = time;
+        my $mark = 0;
+        my @delta;
 
-    {
-        my $path = Sophie::Scan::RpmsPath
-            ->new($pathkey, Sophie::Scan->new);
-        #$path->set_no_needupdate;
+        {
+            my $path = Sophie::Scan::RpmsPath
+                ->new($pathkey, Sophie::Scan->new);
 
-        $mark = $path->get_needupdate;
-        @delta = $path->find_delta;
-    }
+            $mark = $path->get_needupdate;
+            @delta = $path->find_delta;
+        }
 
-    while (my @d = splice(@delta, 0, 10)) {
-        my $scan = Sophie::Scan->new;
-        my $path = Sophie::Scan::RpmsPath->new($pathkey, $scan);
-        $path->update_content(@d);
-        last if (time > $time + 7 * 60);
-    }
+        while (my @d = splice(@delta, 0, 10)) {
+            my $scan = Sophie::Scan->new;
+            my $path = Sophie::Scan::RpmsPath->new($pathkey, $scan);
+            $path->update_content(@d);
+            last if (time > $time + 7 * 60);
+        }
 
-    if (!@delta) { # update only if we finished
-        my $path = Sophie::Scan::RpmsPath->new($pathkey, Sophie::Scan->new);
-        $path->set_updated;
-        $path->set_no_needupdate
-            unless ($mark ne $path->get_needupdate);
+        if (!@delta) { # update only if we finished
+            my $path = Sophie::Scan::RpmsPath->new($pathkey, Sophie::Scan->new);
+            $path->set_updated;
+            $path->set_no_needupdate
+                unless ($mark ne $path->get_needupdate);
+        }
     }
 }
 
+openlog('sophie-notify', 'ndelay,pid' . ($daemon ? '' : ',perror'), 'user');
+$SIG{__WARN__} = sub {
+    syslog('warning', @_);
+};
+$SIG{__DIE__} = sub {
+    syslog('crit', @_);
+    exit(1);
+};
+
+if ($daemon) {
+    if (fork()) {
+        exit(0);
+    }
+    warn "Fork done, entering daemon mode\n";
+}
+
+if ($pidfile) {
+    if (open(my $handle, '>', $pidfile)) {
+        print $handle $$ . "\n";
+        close($handle);
+    } else {
+        die "Can't write pidfile $pidfile, exiting :\\\n";
+    }
+}
+
+
+if ($runas) {
+    my ($login,$pass,$uid,$gid) = $runas =~ /^\d/
+    ? getpwuid($runas)
+    : getpwnam($runas);
+
+    $> = $uid; $) = $gid;
+    if ($> ne $uid) {
+        die "Cannot change to user $runas\n";
+    }
+}
+
+$sleep ||= 60;
+
+while (1) {
+    my $csleep = int(rand($sleep) + ($sleep / 2 ));
+    my $currenttime = time;
+    if (my $pid = fork) {
+        waitpid($pid, 0);
+    } else {
+        process();
+        exit(0);
+    }
+    my $delay = $csleep - (time - $currenttime);
+
+    if ($delay > 0) {
+        warn "sleep $delay\n";
+        sleep $delay;
+    }
+}

server/trunk/web/lib/Sophie/Controller/Admin.pm

@@ -455 +455 @@
 }
 
+sub help : private {
+    my ( $self, $c, $cmd ) = @_;
+    my $ctx = $c->session->{admin_ctx} || '';
+    my $module = 'Admin::Cli' . ($ctx ? "::$ctx" : '');
+    if ($cmd) {
+        my @message = grep { /\S+/ } split(/\n/,
+            $c->model('Help::POD')->admin_help_text($ctx, $cmd) || 'No help available');
+        return $c->stash->{xmlrpc} = [ $self->prompt($c), \@message ];
+    } else {
+        return $c->stash->{xmlrpc} = [
+            $self->prompt($c),
+            [
+                'available command:',
+                join(', ', sort grep { $_ !~ /^end$/ }
+                    ('help', @{ $c->controller($module)->_commands })),
+            ]
+        ];
+    }
+}   
+
+sub prompt : XMLRPC {
+    my ($self, $c) = @_;
+    my $ctx = $c->session->{admin_ctx} || '';
+    my $path = '/admin/cli' . ($ctx ? lc("/$ctx") : '');
+    if ($c->get_action( 'prompt', $path )) {
+        return $c->stash->{xmlrpc} = $c->forward("$path/prompt");
+    } else {
+        return $c->stash->{xmlrpc} = '> ';
+    }
+}
+
+sub cli : XMLRPC {
+    my ($self, $c, $cmd, @args) = @_;
+
+    if ($cmd eq 'help') {
+        $c->go('help', [ @args ]);
+    }
+    
+    my $ctx = $c->session->{admin_ctx} || '';
+    my $path = '/admin/cli' . ($ctx ? lc("/$ctx") : '');
+    if ($c->get_action( $cmd, $path )) {
+        return $c->go($path . '/' . $cmd, [ @args ]);
+    } else {
+        $c->error( "No such command $cmd" );
+    }
+}
+
+sub complete : XMLRPC {
+    my ($self, $c, $cmd, @args) = @_;
+
+    my $ctx = $c->session->{admin_ctx} || '';
+    my $path = '/admin/cli' . ($ctx ? lc("/$ctx") : '');
+    if ($c->get_action( "_c_$cmd", $path )) {
+        my $vals = $c->go($path . '/' . "_c_$cmd", [ @args ]);
+        return $args[-1] ? [ grep { index($_, $args[-1]) == 0 } @$vals ] : $vals;
+    } else {
+        return $c->stash->{xmlrpc} = [];
+    }
+}
+
+
 =head1 AUTHOR
 

server/trunk/web/lib/Sophie/Model/Help/POD.pm

@@ -76 +76 @@
 }
 
+sub admin_help_text {
+    my ($self, $context, $cmd) = @_;
+    my $module = 'Admin::Cli' . ($context ? "::$context" : '');
+    my $botpom = $self->{pom}{$module};
+    foreach my $head1 ($botpom->content) {
+        $head1->title eq 'AVAILABLE FUNCTIONS' or next;
+        foreach ($head1->content) {
+            $_->title =~ /^\Q$cmd\E( |$)/ or next;
+            my $ppvt = Pod::POM::View::Text->new;
+            return $_->present($ppvt);
+        }
+        last;
+    }
+    return;
+}
+
 sub chat_functions {
     my ($self) = @_;

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

@@ -65 +65 @@
     my ($self) = @_;
 
-    warn "$$ " . $self->path;
+    warn "Scanning " . $self->path . "\n";
 
     my @delta;
@@ -152 +152 @@
 sub remove_rpm {
     my ($self, $rpm) = @_;
-    warn "$$ deleting $rpm";
+    warn "Deleting $rpm\n";
     $self->db->base->storage->txn_do(
         sub {
@@ -166 +166 @@
     my ($self, $rpm) = @_;
 
-    warn "$$ adding $rpm";
+    -f $self->path . '/' . $rpm or return;
+    warn "Adding $rpm\n";
     my @stat = stat($self->path . '/' . $rpm);
     eval {
@@ -199 +200 @@
     };
     $header or do {
-        warn "$$ Cannot read " . $self->path . '/' . $rpm;
+        warn "Cannot read " . $self->path . "/$rpm\n";
         return "";
     };
@@ -208 +209 @@
         )->get_column('pkgid')->all;
         if ($find) {
-            warn "$$ Find";
             return($header->queryformat('%{PKGID}'), 0);
         }