direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-04-20 10:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix read file

Browse Source
This commit is contained in:
Saeed Vaziry 2024-04-14 17:53:08 +02:00
parent 72b37c56fd
commit 5ab6617b5d
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/ServerLog.php
View File

@ -93,7 +93,7 @@ public function write($buf): void
public function getContent(): ?string public function getContent(): ?string
{ {
if ($this->is_remote) { if ($this->is_remote) {
return $this->server->os()->readFile($this->name, 150); return $this->server->os()->tail($this->name, 150);
} }
if (Storage::disk($this->disk)->exists($this->name)) { if (Storage::disk($this->disk)->exists($this->name)) {

5
app/Models/Site.php
View File

@ -4,6 +4,7 @@
use App\Exceptions\SourceControlIsNotConnected; use App\Exceptions\SourceControlIsNotConnected;
use App\SiteTypes\SiteType; use App\SiteTypes\SiteType;
use App\SSH\Services\Webserver\Webserver;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -185,7 +186,9 @@ public function php(): ?Service
public function changePHPVersion($version): void public function changePHPVersion($version): void
{ {
$this->server->webserver()->handler()->changePHPVersion($this, $version); /** @var Webserver $handler */
$handler = $this->server->webserver()->handler();
$handler->changePHPVersion($this, $version);
$this->php_version = $version; $this->php_version = $version;
$this->save(); $this->save();
} }

24
app/SSH/OS/OS.php
View File

@ -108,18 +108,22 @@ public function editFile(string $path, ?string $content = null): void
); );
} }
public function readFile(string $path, ?int $lastLines = null): string public function readFile(string $path): string
{ {
$params = [
'path' => $path,
];
if ($lastLines !== null) {
$params['lines'] = $lastLines;
}
return $this->server->ssh()->exec( return $this->server->ssh()->exec(
$this->getScript('read-file.sh', $params) $this->getScript('read-file.sh', [
'path' => $path,
])
);
}
public function tail(string $path, int $lines): string
{
return $this->server->ssh()->exec(
$this->getScript('tail.sh', [
'path' => $path,
'lines' => $lines,
])
); );
} }

8
app/SSH/OS/scripts/read-file.sh
View File

@ -1,7 +1 @@
if [ -f __path__ ]; then [ -f __path__ ] && sudo cat __path__
if [ -n __lines__ ]; then
sudo tail -n __lines__ __path__
else
sudo cat __path__
fi
fi

1
app/SSH/OS/scripts/tail.sh Normal file
View File

@ -0,0 +1 @@
sudo tail -n __lines__ __path__