Changeset 1490

Timestamp:

04/29/12 19:19:37 (13 months ago)

Author:

bruno

Message:

• Fixes in cb to make it work in debug mode at least with package dhcpd.

Location:

projects/casparbuster/devel

Files:

• bin/cb (modified) (6 diffs)
• lib/CasparBuster/Plugin.pm (modified) (1 diff)

projects/casparbuster/devel/bin/cb

@@ -89 +89 @@
 use Pod::Usage;
 use Data::Dumper;
+use Time::Local;
+use Net::SSH2;
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
@@ -187 +189 @@
             { RaiseError => 1, AutoCommit => 1 })
             || die "Unable to connect to $db";
+my $sth;
 
 if ($precmd ne "") {
-    my $sth = $dbh->prepare(qq{$precmd}) || die "Unable to create table into $db";
+    $sth = $dbh->prepare(qq{$precmd}) || die "Unable to create table into $db";
     if ($debug) {
         pb_log(1,"DEBUG: Creating DB $db\n");
@@ -224 +227 @@
 
 # Cleanup
-pb_rm_rf($dest);
+if (not $debug) {
+    pb_rm_rf($dest);
+} else {
+    pb_log(0,"DEBUG: Please remove manually with rm -rf $dest\n")
+}
 $dbh->disconnect;
 
@@ -237 +244 @@
 
 # Use potentially a remote account if defined
-my $account = undef;
-my $remote = $machine;
-($account) = pb_conf_get_if("cbaccount") if (defined $machine);
-$remote = $account->{$machine}."@".$machine if ((defined $account) && (defined $account->{$machine}));
-pb_log(1, "DEBUG: remote = $remote\n") if (defined $remote);
+my $remote = undef;
+my ($account) = pb_conf_get_if("cbaccount") if (defined $machine);
+$remote = $account->{$machine} if ((defined $account) && (defined $machine) && (defined $account->{$machine}));
+pb_log(1, "DEBUG: remote account1 = $remote\n") if (defined $remote);
+$remote = getpwuid($<) if (not defined $remote);
+pb_log(1, "DEBUG: remote account2 = $remote\n");
 
 # Now handle plugins if any
@@ -298 +306 @@
 my $mac = $machine;
 $mac = "localhost" if (not defined $machine);
-my $all = $dbh->selectall_arrayref("SELECT id,date,file,machine FROM dates WHERE machine=$mac");
-# Check what in cbp is in the DB and deploy only if necessary
+# Allow for errors to occur at DBI level
+$dbh->{RaiseError} = 0;
+my $checkdb = 1;
+my $dbcmd = "SELECT id,date,file,machine FROM dates WHERE machine=\"$mac\"";
+if (! ($sth = $dbh->prepare(qq{$dbcmd}))) {
+        pb_log(0,"Unable to prepare DB statement $dbcmd\n");
+        $checkdb = 0;
+}
+# DisAllow for errors to occur at DBI level
+$dbh->{RaiseError} = 1;
+my $dbid = ();
+if ($checkdb == 1) {
+    $sth->execute();
+    # Check what in cbp is in the DB and deploy only if necessary
+    foreach my $k (keys %{$cbp}) {
+        foreach my $type ('files','dirs') {
+            foreach my $o (keys %{$cbp->{$k}->{$type}}) {
+                # Compare with info from DB
+                foreach my $row ($sth->fetch) {
+                    next if (not defined $row);
+                    my ($id, $date, $file, $mac1) = @$row;
+                    # If less recent than in the DB remove it
+                    $cbp->{$k}->{$type}->{$o}->{'deleted'} = "true" if ((defined $file) && ($file eq $o) && ($date > $cbp->{$k}->{$type}->{$o}->{'mtime'}));
+                    $dbid->{$o} = $id;
+                }
+            }
+        }
+    }
+    $sth->finish();
+}
+pb_log(2,"INFO: cleaned cbp: ".Dumper($cbp)."\n");
+
+# Now create a tar containing all the relevant content
+# We need to loop separately to allow for DB to not exist in the previous loop !
+my $tdir = undef;
+if (defined $machine) {
+    $tdir = "$dest/$machine";
+} else {
+    $tdir = "$dest";
+}
+chdir("$tdir") || die "ERROR: Unable to chdir to $tdir\n";
+pb_log(2,"Working now under $tdir\n");
+
+my $tar = Archive::Tar->new;
+$tar->setcwd($tdir);
+my $curdate = time();
 foreach my $k (keys %{$cbp}) {
     foreach my $type ('files','dirs') {
-        foreach my $o (keys %{$cbp->{$k}->{$type}}) {
-            # Compare with info from DB
-            foreach my $row (@$all) {
-                my ($id, $date, $file, $mac1) = @$row;
-                # If less recent than in the DB remove it
-                delete($cbp->{$k}->{$type}->{$o}) if (($file eq $o) && ($date > $cbp->{$k}->{$type}->{$o}->{'mtime'}));
+        foreach my $o ((keys %{$cbp->{$k}->{$type}})) {
+            if (not defined $cbp->{$k}->{$type}->{$o}->{'deleted'}) {
+                $tar->add_files("./$o");
+                # Add an entry to the DB
+                if (defined $dbid->{$o}) {
+                    # Modify an existing entry
+                    $dbcmd = "UPDATE dates SET date=$curdate,file=$o WHERE id='?'";
+                    if (not $debug) {
+                        $sth = $dbh->prepare(qq{$dbcmd});
+                        $sth = $dbh->execute($dbid->{$o});
+                    } else {
+                        pb_log(0,"Executing in DB: $dbcmd with curdate=$curdate,file=$o,id=$dbid->{$o}\n");
+                    }
+                } else {
+                    # Add an new entry
+                    $dbcmd = "INSERT INTO dates VALUES (NULL,?,?,$mac)";
+                    if (not $debug) {
+                        $sth = $dbh->prepare(qq{$dbcmd});
+                        $sth = $dbh->execute($curdate,$o);
+                    } else {
+                        pb_log(0,"Executing in DB: $dbcmd with curdate=$curdate,file=$o,machine=$mac\n");
+                    }
+                }
+                if (not $debug) {
+                    $sth->finish();
+                }
             }
         }
     }
 }
-pb_log(2,"INFO: cleaned cbp: ".Dumper($cbp)."\n");
-
-# Now create a tar containing all the relevant content
-my $tar = Archive::Tar->new;
+my $tarfile = "$ENV{'TMPDIR'}/cbcontent$$.tar";
+$tar->write("$tarfile");
+
+my $ssh2;
+my $chan;
+
+# deal with content first
+if (defined $machine) {
+    # Create remote connection and copy tar file there
+    $ssh2 = Net::SSH2->new();
+    $ssh2->connect($machine);
+    my $hdir = (getpwnam(getpwuid($<)))[7];
+    if ($ssh2->auth_publickey($remote,"$hdir/.ssh/id_dsa.pub","$hdir/.ssh/id_dsa")) {
+        $chan = $ssh2->channel();
+        if (not $debug) {
+            $chan->exec("if [ ! -d $ENV{'TMPDIR'} ]; then mkdir -p $ENV{'TMPDIR'} fi");
+            $ssh2->scp_put($tarfile,$ENV{'TMPDIR'});
+            #$chan->exec("cd / ; tar xf $tarfile");
+        } else {
+            pb_log(1,"INFO: creating $ENV{'TMPDIR'} if needed on $remote\@$machine and copying content\n");
+        }
+    } else {
+        pb_log(0,"ERROR: Unable to authenticate to $remote\@$machine\n");
+        return;
+    }
+}
+
+# Pointer to function depending whether we're local or remote
+my $func;
+if (defined $machine) {
+    $func = \&{ $chan->exec };
+} else {
+    $func = \&pb_system;
+}
+
+if (not $debug) {
+    &$func("cd / ; tar xf $tarfile");
+} else {
+    pb_log(1,"INFO: Extracting (on $mac) $tarfile under /\n");
+}
+
 foreach my $k (keys %{$cbp}) {
-    $tar->add_files((keys %{$cbp->{$k}->{'files'}}),(keys %{$cbp->{$k}->{'dirs'}}));
-    # Add an entryo to the DB
-}
-my $tarfile = "$ENV{'TMPDIR'}/content$$.tar";
-$tar->write("$tarfile");
-
-my $cmd = "";
-# Copy the tar file and extract it + set up modes/uids/gids
+    foreach my $type ('files','dirs') {
+        foreach my $o ((keys %{$cbp->{$k}->{$type}})) {
+            if (not defined $cbp->{$k}->{$type}->{$o}->{'deleted'}) {
+                if ($debug) {
+                    pb_log(1,"INFO: Executing (on $mac) sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $o\n");
+                    pb_log(1,"INFO: Executing (on $mac) sudo chmod $cbp->{$k}->{$type}->{$o}->{'mode'} $o\n");
+                } else {
+                    &$func("sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $o");
+                    &$func("sudo chmod $cbp->{$k}->{$type}->{$o}->{'mode'} $o");
+                }
+            }
+        }
+    }
+    if (defined $cbp->{$k}->{'reloadscript'}) {
+        if ($debug) {
+            pb_log(1,"INFO: Executing (on $mac) sudo $cbp->{$k}->{'reloadscript'}\n");
+        } else {
+            &$func("sudo $cbp->{$k}->{'reloadscript'}");
+        }
+    }
+}
+
 if (defined $machine) {
-    $cmd = "scp -p -q $tarfile $remote:/tmp";
-} else {
-    $cmd = "cp -p $source /tmp";
-}
-
-if ($debug) {
-    pb_log(1,"DEBUG: launching $cmd\n");
-} else {
-    pb_system($cmd);
-    pb_log(0,"INFO: \n");
+    # Remote cleanup
+    $chan->exec("rm -rf $ENV{'TMPDIR'}");
+    $ssh2->disconnect();
+}
+
+# Cleanup
+if (not $debug) {
+    unlink("$tarfile");
+} else {
+    pb_log(0,"DEBUG: Please remove manually with rm -f $tarfile\n")
 }
 pb_log(2,"Exiting cb_distribute\n");
@@ -342 +465 @@
 sub cb_add_to_cbp {
 
+pb_log(3,"Entering into cb_addto_cbp\n");
 my $type = 'files';
 if (-d $File::Find::name) {

projects/casparbuster/devel/lib/CasparBuster/Plugin.pm

@@ -77 +77 @@
 my $cbp = shift;
 
+pb_log(2,"Entering cb_plugin_get for plugin $plugin\n");
 my ($flist,$dlist,$slist) = pb_conf_get_if("cbpluginfiles","cbplugindirs","cbpluginreload");
 if ((defined $flist) && (defined $flist->{$plugin}) && ($flist->{$plugin} !~ /^\s*$/)) {