devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

clearDB에 $db 전달

Browse Source
This commit is contained in:
Hide_D
2024-05-17 17:59:27 +00:00
parent 0b8e91efe8
commit 625cf81f1f
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/j_install_db.php
+1 -8
View File
@@ -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__); $prefix = basename(__DIR__);
$result = Util::generateFileUsingSimpleTemplate( $result = Util::generateFileUsingSimpleTemplate(
@@ -109,7 +102,7 @@ if (!class_exists('\\sammo\\DB')) {
opcache_reset(); opcache_reset();
} }
ResetHelper::clearDB(); ResetHelper::clearDB($db, $prefix);
ServConfig::getServerList()[$prefix]->closeServer(); ServConfig::getServerList()[$prefix]->closeServer();
hwe/sammo/ResetHelper.php
+9 -4
View File
@@ -8,7 +8,7 @@ class ResetHelper{
} }
static public function clearDB(){ static public function clearDB(?\MeekroDB $db = null, ?string $prefix = null):array{
$servRoot = realpath(__DIR__.'/../'); $servRoot = realpath(__DIR__.'/../');
if(!file_exists($servRoot.'/logs') || !file_exists($servRoot.'/data')){ 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(); ServConfig::getServerList()[$prefix]->closeServer();
$db = DB::db(); if($db === null){
$db = DB::db();
}
$mysqli_obj = $db->get(); $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.'/logs/'.$serverID, 0775);
mkdir($servRoot.'/data/'.$serverID, 0775); mkdir($servRoot.'/data/'.$serverID, 0775);