[wiaflos-devel] COMMIT - r270 - trunk/wiaflos/server

[svn at linuxrulz.org]

Author: nkukard
Date: 2008-12-30 07:39:52 +0000 (Tue, 30 Dec 2008)
New Revision: 270

Modified:
   trunk/wiaflos/server/Reporting.pm
Log:
* Added more verbose errors when in background mode


Modified: trunk/wiaflos/server/Reporting.pm
===================================================================
--- trunk/wiaflos/server/Reporting.pm	2008-12-30 06:49:08 UTC (rev 269)
+++ trunk/wiaflos/server/Reporting.pm	2008-12-30 07:39:52 UTC (rev 270)
@@ -805,8 +805,13 @@
 		# Load template
 		my $res = loadTemplate($template,$vars,$filename);
 		if (!$res) {
-			setError("Failed to load template '$template': ".wiaflos::server::templating::Error());
-			return ERR_SRVTEMPLATE;	
+			if (!$background) {
+				setError("Failed to load template '$template': ".wiaflos::server::templating::Error());
+				return ERR_SRVTEMPLATE;
+			} else {
+				wiaflos::server::jobs::setStatus("Failed to load template '$template': ".wiaflos::server::templating::Error());
+				exit 0;
+			}
 		}
 
 	# Write out using email
@@ -817,14 +822,24 @@
 		# Verify SMTP server is set
 		my $server = $config->{'mail'}{'server'};
 		if (!defined($server) || $server eq "") {
-			setError("Cannot use report emailing if we do not have an SMTP server defined");
-			return ERR_SRVPARAM;
+			if (!$background) {
+				setError("Cannot use report emailing if we do not have an SMTP server defined");
+				return ERR_SRVPARAM;
+			} else {
+				wiaflos::server::jobs::setStatus("Cannot use report emailing if we do not have an SMTP server defined");
+				exit 0;
+			}
 		}
 
 		# Check if we have a email addy
 		if (!defined($emailAddy) || $emailAddy eq "") {
-			setError("No email address defined to send reports to");
-			return ERR_PARAM;
+			if (!$background) {
+				setError("No email address defined to send reports to");
+				return ERR_PARAM;
+			} else {
+				wiaflos::server::jobs::setStatus("No email address defined to send reports to");
+				exit 0;
+			}
 		}
 
 		# Report filename
@@ -846,8 +861,13 @@
 			# Load template
 			my $res = loadTemplate($message_template,$vars2,\$emailBody);
 			if (!$res) {
-				setError("Failed to load template '$message_template': ".wiaflos::server::templating::Error());
-				return ERR_SRVTEMPLATE;	
+				if (!$background) {
+					setError("Failed to load template '$message_template': ".wiaflos::server::templating::Error());
+					return ERR_SRVTEMPLATE;
+				} else {
+					wiaflos::server::jobs::setStatus("Failed to load template '$message_template': ".wiaflos::server::templating::Error());
+					exit 0;
+				}
 			}
 
 			$emailBody =~ s/(?<!\r)\n/\r\n/sg; # Sanitize eol for crypt-gpg
@@ -859,8 +879,13 @@
 		my $reportData = "";
 		my $res = loadTemplate($template,$vars,\$reportData);
 		if (!$res) {
-			setError("Failed to load template '$template': ".wiaflos::server::templating::Error());
-			return ERR_SRVTEMPLATE;	
+			if (!$background) {
+				setError("Failed to load template '$template': ".wiaflos::server::templating::Error());
+				return ERR_SRVTEMPLATE;
+			} else {
+				wiaflos::server::jobs::setStatus("Failed to load template '$template': ".wiaflos::server::templating::Error());
+				exit 0;
+			}
 		}
 		$reportData =~ s/(?<!\r)\n/\r\n/sg; # Sanitize eol, needed to fix bug in crypt-gpg where it mangles \n
 
@@ -878,8 +903,13 @@
 			# Sign report
 			$sign = $gpg->sign($reportData);
 			if (!defined($sign)) {
-				setError("Failed to sign report");
-				return ERR_SRVEXEC;
+				if (!$background) {
+					setError("Failed to sign report");
+					return ERR_SRVEXEC;
+				} else {
+					wiaflos::server::jobs::setStatus("Failed to sign report");
+					exit 0;
+				}
 			}
 		}
 
@@ -925,13 +955,23 @@
 		# Send email
 		my @SMTPParams;
 		if (!(my $res = $msg->send("smtp",$server))) {
-			setError("Failed to send report via email server '$server'");
-			return ERR_SRVEXEC;
+			if (!$background) {
+				setError("Failed to send report via email server '$server'");
+				return ERR_SRVEXEC;
+			} else {
+				wiaflos::server::jobs::setStatus("Failed to send report via email server '$server'");
+				exit 0;
+			}
 		}
 	
 	} else {
-		setError("Invalid SendTo method provided");
-		return ERR_PARAM;
+		if (!$background) {
+			setError("Invalid SendTo method provided");
+			return ERR_PARAM;
+		} else {
+			wiaflos::server::jobs::setStatus("Invalid SendTo method provided");
+			exit 0;
+		}
 	}
 
 	wiaflos::server::jobs::setStatus("Done");