From 9b6e88bc33a235da4106a5c19178b0f754776679 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 6 Sep 2018 19:44:25 +0900
Subject: [PATCH] Add try...catch to trigger functions

---
 classes/module/ModuleHandler.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 3c091437f..757c2576c 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -1300,9 +1300,16 @@ class ModuleHandler extends Handler
 		$trigger_functions = $oModuleModel->getTriggerFunctions($trigger_name, $called_position);
 		foreach($trigger_functions as $item)
 		{
-			$before_each_trigger_time = microtime(true);
-			$output = $item($obj);
-			$after_each_trigger_time = microtime(true);
+			try
+			{
+				$before_each_trigger_time = microtime(true);
+				$output = $item($obj);
+				$after_each_trigger_time = microtime(true);
+			}
+			catch (Rhymix\Framework\Exception $e)
+			{
+				$output = new BaseObject(-2, $e->getMessage());
+			}
 
 			if ($trigger_name !== 'common.writeSlowlog')
 			{