Changeset 1786 in ProjectBuilder

Timestamp:

Aug 1, 2013, 10:02:49 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Add a command checkps -interface to the internal pb_check_ps)

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -376 +376 @@
 
 Check the delivery of the packages on the repository
+
+=item B<checkps>
+
+Check the process running the VM concerned
 
 =item B<newver>
@@ -956 +960 @@
 } elsif ($action =~ /^checkssh$/) {
     pb_announce("Check");
+} elsif ($action =~ /^checkps$/) {
+    my ($ptr2) = pb_conf_get("vmcmd");
+    my $vmcmd = $ptr2->{$ENV{'PBPROJ'}};
+    my ($vmexist,$vmmport) = pb_check_ps($vmcmd,$ENV{'PBV'});
+    if (! $vmexist) {
+        pb_log(0,"No VM found for $ENV{'PBV'}\n");
+    } else {
+        pb_log(0,"Found an existing VM for $ENV{'PBV'} PID: $vmexist - SSH port: $vmmport\n");
+    }
 } elsif ($action =~ /^sbx2webpkg$/) {
     require DBI;
@@ -2701 +2714 @@
             } else {
                 # Is the SSH port free? if not kill the existing process using it after a build timeout period
-                my $vmssh = pb_check_ps($tmpcmd,"tcp:127.0.0.1:$nport-:22");
+                my $vmssh = pb_check_ps($tmpcmd,$vmm);
                 if ($vmssh) {
                     my $buildtm = $ENV{'PBVMTMOUT'};
@@ -4178 +4191 @@
         next if (! /$vmcmd/);
         next if (! /$vmm/);
-        my ($void1, $void2);
+        my $void1;
         ($void1, $vmexist, $vmport) = split(/ +/,$_,3);
         pb_log(2,"pb_check_ps $vmport\n");
-        $vmport =~ s/.*=tcp\:127\.0\.0\.1\:([0-9]+)-:22.*/$1/;
+        $vmport =~ s/.*=tcp:127\.0\.0\.1:([0-9]+)-:22.*/$1/;
         chomp($vmport);
         pb_log(2,"pb_check_ps found a VM $vmexist using port $vmport\n");