Changeset 1153 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Log.pm

Timestamp:

Jan 12, 2011, 2:42:12 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Avoid File::MimeInfo hard requirement. Only abort if not found when needed.
• Improve report when a perl module is missing
• Kill an existing crashed VM using an SSH port needed for another VM (should avoid crashed VM to stay when building for all VMs)
• Use a new parameter vmbuildtm as a timeout before killing the VM (shoudl correspond to build + transfer time)
• use twice the number of VMs for ports in the range for SSH communication to allow for VMs to finish in an unordered way.
• Fix a bug in test modules when using Test simple only
• Mail::Sendmail is now optional for Log module as well, even if not used yet
• Update pb.conf doc with info for vmbuildtm and vmmem
• Ready for 0.10.1

File:

• devel/pb-modules/lib/ProjectBuilder/Log.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Log.pm

@@ -227 +227 @@
 # mails the summary to $to
 sub mailSummary {
-    require Mail::Sendmail;
-    my $self = shift;
-    my $to = shift || "";
-
-    if ($to eq "") {
-        pb_log(0,"Please give a To: address\n");
-        return;
-    }
-    my %mail = (    
-        To => $to,
-        From => "pb\@localhost",
-        Message => $self->summary()
-    );
-    if (! sendmail(%mail)) { 
-        if (defined $Mail::Sendmail::error) {
-            return $Mail::Sendmail::error;
-        } else {
-            return "Unkown error";
-        }
-    }
-    pb_log(0,"Mail send to ". $to ."\n");
+    eval
+    {
+        require Mail::Sendmail;
+        Mail::Sendmail->import();
+    };
+    if ($@) {
+        # Mail::Sendmail not found not sending mail !
+        pb_log(0,"No Mail::Sendmail module found so not sending any mail !\n");
+    } else {
+        my $self = shift;
+        my $to = shift || "";
+
+        if ($to eq "") {
+            pb_log(0,"Please give a To: address\n");
+            return;
+        }
+        my %mail = (    
+            To => $to,
+            From => "pb\@localhost",
+            Message => $self->summary()
+        );
+        if (! sendmail(%mail)) { 
+            if (defined $Mail::Sendmail::error) {
+                return $Mail::Sendmail::error;
+            } else {
+                return "Unkown error";
+            }
+        }
+        pb_log(0,"Mail send to ". $to ."\n");
+    }
 }