Don't totally fallover if gearman isn't running when it should be.

mydnshost · Nov 10, 2018 · 72a32ae · 72a32ae
1 parent 7eeab06
commit 72a32ae
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/functions.php b/functions.php
@@ -63,9 +63,16 @@ function checkDBAlive() {
 
 	if ($config['jobserver']['type'] == 'gearman') {
 		$gmc = new GearmanClient();
-		$gmc->addServer($config['jobserver']['host'], $config['jobserver']['port']);
-		$gmc->setTimeout(5000);
+		try {
+			$gmc->addServer($config['jobserver']['host'], $config['jobserver']['port']);
+			$gmc->setTimeout(5000);
+		} catch (Exception $e) {
+			$config['jobserver']['type'] == 'none';
+			$gmc == null;
+		}
+	}
 
+	if ($gmc !== null) {
 		HookManager::get()->addHook('send_mail', function($to, $subject, $message, $htmlmessage = NULL) use ($gmc) {
 			@$gmc->doBackground('sendmail', json_encode(['to' => $to, 'subject' => $subject, 'message' => $message, 'htmlmessage' => $htmlmessage]));
 		});