Merge pull request #52 from nextcloud/server-1716-activity-sending-ti…

…meout

Catch errors when one email could not be sent

lib/BackgroundJob/EmailNotification.php

@@ -108,6 +108,8 @@ protected function runStep($limit, $sendTime) {
 		// Send Email
 		$default_lang = $this->config->getSystemValue('default_language', 'en');
 		$defaultTimeZone = date_default_timezone_get();
+
+		$deleteItemsForUsers = [];
 		foreach ($affectedUsers as $user) {
 			if (empty($userEmails[$user])) {
 				// The user did not setup an email address
@@ -118,11 +120,15 @@ protected function runStep($limit, $sendTime) {
 
 			$language = (!empty($userLanguages[$user])) ? $userLanguages[$user] : $default_lang;
 			$timezone = (!empty($userTimezones[$user])) ? $userTimezones[$user] : $defaultTimeZone;
-			$this->mqHandler->sendEmailToUser($user, $userEmails[$user], $language, $timezone, $sendTime);
+			if ($this->mqHandler->sendEmailToUser($user, $userEmails[$user], $language, $timezone, $sendTime)) {
+				$deleteItemsForUsers[] = $user;
+			} else {
+				$this->logger->debug("Failed sending activity mail to user '" . $user . "'.", ['app' => 'activity']);
+			}
 		}
 
 		// Delete all entries we dealt with
-		$this->mqHandler->deleteSentItems($affectedUsers, $sendTime);
+		$this->mqHandler->deleteSentItems($deleteItemsForUsers, $sendTime);
 
 		return sizeof($affectedUsers);
 	}

lib/MailQueueHandler.php

@@ -218,11 +218,12 @@ protected function getSenderData($setting) {
 	 * @param string $lang Selected language of the recipient
 	 * @param string $timezone Selected timezone of the recipient
 	 * @param int $maxTime
+	 * @return bool True if the entries should be removed, false otherwise
 	 */
 	public function sendEmailToUser($userName, $email, $lang, $timezone, $maxTime) {
 		$user = $this->userManager->get($userName);
 		if (!$user instanceof IUser) {
-			return;
+			return true;
 		}
 
 		list($mailData, $skippedCount) = $this->getItemsForUser($userName, $maxTime);
@@ -270,9 +271,15 @@ public function sendEmailToUser($userName, $email, $lang, $timezone, $maxTime) {
 		$message->setSubject((string) $l->t('Activity notification'));
 		$message->setPlainBody($emailText);
 		$message->setFrom([$this->getSenderData('email') => $this->getSenderData('name')]);
-		$this->mailer->send($message);
+
+		try {
+			$this->mailer->send($message);
+		} catch (\Exception $e) {
+			return false;
+		}
 
 		$this->activityManager->setCurrentUserId(null);
+		return true;
 	}
 
 	/**