Website
/
Manager
1
0
Fork 0
Code Releases 11 Activity

Optimize IarMonitor

master
Anonymous Contributor 2023-09-11 06:04:30 +02:00
parent dbcb57f71f
commit 6a4c343b03
2 changed files with 73 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
app/cron/IarMonitor.php
View File

@ -9,6 +9,10 @@ use Mcp\Util\Util;
class IarMonitor extends CronJob class IarMonitor extends CronJob
{ {
private ?RestConsole $console;
private bool $consoleAvailable = true;
public function __construct(\Mcp\Mcp $app) public function __construct(\Mcp\Mcp $app)
{ {
parent::__construct($app, Frequency::EACH_MINUTE); parent::__construct($app, Frequency::EACH_MINUTE);
@ -18,35 +22,47 @@ class IarMonitor extends CronJob
{ {
$opensim = new OpenSim($this->app->db()); $opensim = new OpenSim($this->app->db());
$statement = $this->app->db()->prepare("SELECT userID,iarfilename,filesize,state,created FROM mcp_iar_state WHERE state < ?"); $dirPath = $this->app->getDataDir().DIRECTORY_SEPARATOR.'iars';
if (!is_dir($dirPath)) {
mkdir($dirPath);
}
$statement = $this->app->db()->prepare("SELECT userID,iarfilename,filesize,state FROM mcp_iar_state WHERE state < ?");
$statement->execute([2]); $statement->execute([2]);
while ($row = $statement->fetch()) { if ($statement->rowCount() > 0) {
if ($row['state'] == 0) { // 0 - Request to OS pending while ($row = $statement->fetch()) {
$name = explode(' ', $opensim->getUserName($row['userID'])); if ($row['state'] == 0) { // 0 - Request to OS pending
if ($this->console() === false) {
continue;
}
$restCfg = $this->app->config('restconsole'); $name = explode(' ', $opensim->getUserName($row['userID']));
$restConsole = new RestConsole($restCfg['host'], intval($restCfg['port'])); if ($this->console()->sendCommand('save iar '.$name[0].' '.$name[1].' /* password '.$this->app->config('iarfetcher')['os-iar-path'].$row['iarfilename'])) {
if ($restConsole->startSession($restCfg['user'], $restCfg['password']) && $restConsole->sendCommand('save iar '.$name[0].' '.$name[1].' /* password '.$restCfg['os-iar-path'].$row['iarfilename'])) { $statementUpdate = $this->app->db()->prepare('UPDATE mcp_iar_state SET state = ? WHERE userID = ?');
$statementUpdate = $this->app->db()->prepare('UPDATE mcp_iar_state SET state = ? WHERE userID = ?'); $statementUpdate->execute([1, $row['userID']]);
$statementUpdate->execute([1, $row['userID']]); }
} } elseif ($row['state'] == 1) { // 1 - IAR Creation in progress
} elseif ($row['state'] == 1) { // 1 - IAR Creation in progress $fullFilePath = $dirPath.DIRECTORY_SEPARATOR.$row['iarfilename'];
$fullFilePath = $this->app->getDataDir().DIRECTORY_SEPARATOR.'iars'.DIRECTORY_SEPARATOR.$row['iarfilename']; if (file_exists($fullFilePath)) {
if (file_exists($fullFilePath)) { $filesize = filesize($fullFilePath);
$filesize = filesize($fullFilePath);
if ($filesize != $row['filesize']) { if ($filesize != $row['filesize']) {
$statementUpdate = $this->app->db()->prepare('UPDATE mcp_iar_state SET filesize = ? WHERE userID = ?'); $statementUpdate = $this->app->db()->prepare('UPDATE mcp_iar_state SET filesize = ? WHERE userID = ?');
$statementUpdate->execute([$filesize, $row['userID']]); $statementUpdate->execute([$filesize, $row['userID']]);
} else { } else {
$statementUpdate = $this->app->db()->prepare('UPDATE mcp_iar_state SET state = ?, created = ? WHERE userID = ?'); $statementUpdate = $this->app->db()->prepare('UPDATE mcp_iar_state SET state = ?, created = ? WHERE userID = ?');
$statementUpdate->execute([2, time(), $row['userID']]); $statementUpdate->execute([2, time(), $row['userID']]);
Util::sendInworldIM("00000000-0000-0000-0000-000000000000", $row['userID'], "Inventory", $this->app->config('grid')['homeurl'], "Deine IAR ist fertig zum Download: https://".$this->app->config('domain').'/iars/'.$row['iarfilename']); Util::sendInworldIM("00000000-0000-0000-0000-000000000000", $row['userID'], "Inventory", $this->app->config('grid')['homeurl'], "Deine IAR ist fertig zum Download: https://".$this->app->config('domain').'/index.php?api=downloadIar&id='.substr($row['iarfilename'], 0, strlen($row['iarfilename']) - 4));
}
} }
} }
} }
if ($this->consoleAvailable) {
$this->console->closeSession();
}
} }
// 2 - IAR creation finished; delete if expired // 2 - IAR creation finished; delete if expired
@ -55,7 +71,7 @@ class IarMonitor extends CronJob
$statementExpired->execute([2, $weekOld]); $statementExpired->execute([2, $weekOld]);
$statementDeleteExpired = $this->app->db()->prepare('DELETE FROM mcp_iar_state WHERE state = ? AND userID = ?'); $statementDeleteExpired = $this->app->db()->prepare('DELETE FROM mcp_iar_state WHERE state = ? AND userID = ?');
while ($row = $statementExpired->fetch()) { while ($row = $statementExpired->fetch()) {
$fullFilePath = $this->app->getDataDir().DIRECTORY_SEPARATOR.'iars'.DIRECTORY_SEPARATOR.$row['iarfilename']; $fullFilePath = $dirPath.DIRECTORY_SEPARATOR.$row['iarfilename'];
if (file_exists($fullFilePath) && unlink($fullFilePath)) { if (file_exists($fullFilePath) && unlink($fullFilePath)) {
$statementDeleteExpired->execute([2, $row['userID']]); $statementDeleteExpired->execute([2, $row['userID']]);
} }
@ -63,4 +79,25 @@ class IarMonitor extends CronJob
return true; return true;
} }
private function console(): RestConsole|bool
{
if (!$this->consoleAvailable) {
return false;
}
if ($this->console == null) {
$restCfg = $this->app->config('iarfetcher');
$console = new RestConsole($restCfg['host'], intval($restCfg['port']));
if ($console->startSession($restCfg['user'], $restCfg['password'])) {
$this->console = $console;
}
else {
$this->consoleAvailable = false;
return false;
}
}
return $this->console;
}
} }

9
app/opensim/RestConsole.php
View File

@ -31,6 +31,15 @@ class RestConsole
return true; return true;
} }
public function closeSession(): void
{
$response = $this->sendRequest('/CloseSession/', [
'ID' => $this->sessionId
]);
$this->detectError($response, '/CloseSession/');
}
public function readResponses(): array public function readResponses(): array
{ {
if ($this->sessionId == null) { if ($this->sessionId == null) {