From 625cf81f1fb4bf60b22844fb553df60cfbe00a2b Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 17 May 2024 17:59:27 +0000
Subject: [PATCH] =?UTF-8?q?clearDB=EC=97=90=20$db=20=EC=A0=84=EB=8B=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_install_db.php      |  9 +--------
 hwe/sammo/ResetHelper.php | 13 +++++++++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/hwe/j_install_db.php b/hwe/j_install_db.php
index 6a35917c..dfb39ed8 100644
--- a/hwe/j_install_db.php
+++ b/hwe/j_install_db.php
@@ -63,13 +63,6 @@ $db->addHook('run_failed', function(){
     ]);
 });
 
-//unset db object
-$mysqli_obj = $db->get();
-unset($mysqli_obj);
-$db->disconnect();
-unset($db);
-
-
 $prefix = basename(__DIR__);
 
 $result = Util::generateFileUsingSimpleTemplate(
@@ -109,7 +102,7 @@ if (!class_exists('\\sammo\\DB')) {
     opcache_reset();
 }
 
-ResetHelper::clearDB();
+ResetHelper::clearDB($db, $prefix);
 
 ServConfig::getServerList()[$prefix]->closeServer();
 
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index a6cb8003..3fd7ad05 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -8,7 +8,7 @@ class ResetHelper{
 
     }
 
-    static public function clearDB(){
+    static public function clearDB(?\MeekroDB $db = null, ?string $prefix = null):array{
         $servRoot = realpath(__DIR__.'/../');
 
         if(!file_exists($servRoot.'/logs') || !file_exists($servRoot.'/data')){
@@ -72,13 +72,18 @@ class ResetHelper{
             }
         }
 
-        $prefix = DB::prefix();
+        if($prefix === null){
+            $prefix = DB::prefix();
+        }
+
         ServConfig::getServerList()[$prefix]->closeServer();
 
-        $db = DB::db();
+        if($db === null){
+            $db = DB::db();
+        }
         $mysqli_obj = $db->get();
 
-        $serverID = DB::prefix().'_'.date("ymd").'_'.Util::randomStr(4);
+        $serverID = $prefix.'_'.date("ymd").'_'.Util::randomStr(4);
 
         mkdir($servRoot.'/logs/'.$serverID, 0775);
         mkdir($servRoot.'/data/'.$serverID, 0775);