mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use better filesystem functions (#13735)

Browse Source 
* Use better filesystem functions

* Update DeviceObserver.php

* Update DeviceObserver.php

Co-authored-by: Tony Murray <murraytony@gmail.com>
This commit is contained in:
Jellyfrog
2022-02-02 14:40:45 +01:00
committed by GitHub
parent b93a892feb
commit 0da545740e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Observers/DeviceObserver.php
View File

@@ -5,7 +5,7 @@ namespace App\Observers;
use App;
use App\ApiClients\Oxidized;
use App\Models\Device;
use Illuminate\Support\Str;
use File;
use Log;
class DeviceObserver
@@ -59,10 +59,15 @@ class DeviceObserver
public function deleted(Device $device): void
{
// delete rrd files
$host_dir = addcslashes(escapeshellarg(\Rrd::dirFromHost($device->hostname)), '\'');
$result = trim(shell_exec("bash -c '( [ ! -d $host_dir ] || rm -vrf $host_dir 2>&1 ) && echo -n OK'"));
if (! Str::endsWith($result, 'OK')) {
Log::debug("Could not $device->hostname files: $result");
$host_dir = \Rrd::dirFromHost($device->hostname);
try {
$result = File::deleteDirectory($host_dir);
if (! $result) {
Log::debug("Could not delete RRD files for: $device->hostname");
}
} catch (\Exception $e) {
Log::error("Could not delete RRD files for: $device->hostname", [$e]);
}
Log::event("Device $device->hostname has been removed", 0, 'system', 3);