From 43ee0015ea25274d247d81e4a03d47382660ca22 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 17 May 2024 17:12:58 +0000
Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=86=A8=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_install/j_install_status.php | 11 ++---------
 hwe/j_install_db.php           | 23 ++++++++++-------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/f_install/j_install_status.php b/f_install/j_install_status.php
index 642a3f20..5d3b9af0 100644
--- a/f_install/j_install_status.php
+++ b/f_install/j_install_status.php
@@ -17,18 +17,11 @@ if (!class_exists('\\sammo\\RootDB')) {
 
 $rootDB = RootDB::db();
 
-$rootDB->throw_exception_on_nonsql_error = false;
-$rootDB->nonsql_error_handler = function ($params) {
-    Json::die([
-        'step' => 'conn_fail'
-    ]);
-};
-
-$rootDB->error_handler = function ($params) {
+$rootDB->addHook('run_failed', function ($params) {
     Json::die([
         'step' => 'sql_fail'
     ]);
-};
+});
 
 $memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from member');
 if ($memberCnt == 0) {
diff --git a/hwe/j_install_db.php b/hwe/j_install_db.php
index 64d23225..c6eb110e 100644
--- a/hwe/j_install_db.php
+++ b/hwe/j_install_db.php
@@ -53,22 +53,17 @@ if($fullReset){
     }
 }
 
-function dbConnFail($params){
+$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
+$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
+
+$db->addHook('run_failed', function(){
     Json::die([
         'result'=>false,
         'reason'=>'DB 접속에 실패했습니다.'
     ]);
-}
+});
 
-
-$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
-$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-$db->throw_exception_on_nonsql_error = false;
-$db->nonsql_error_handler = 'dbConnFail';
-
-
-$mysqli_obj = $db->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
+$mysqli_obj = $db->get();
 
 $prefix = basename(__DIR__);
 
@@ -84,8 +79,6 @@ $result = Util::generateFileUsingSimpleTemplate(
     ], true
 );
 
-
-
 if($result !== true){
     Json::die([
         'result'=>false,
@@ -93,6 +86,10 @@ if($result !== true){
     ]);
 }
 
+if (!class_exists('\\sammo\\DB')) {
+    opcache_reset();
+}
+
 ResetHelper::clearDB();
 
 ServConfig::getServerList()[$prefix]->closeServer();