Use better filesystem functions (librenms#13735)

* Use better filesystem functions * Update DeviceObserver.php * Update DeviceObserver.php Co-authored-by: Tony Murray <[email protected]>
digitalwm · Feb 2, 2022 · 0da5457 · 0da5457
1 parent b93a892
commit 0da5457
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/app/Observers/DeviceObserver.php b/app/Observers/DeviceObserver.php
@@ -5,7 +5,7 @@
 use App;
 use App\ApiClients\Oxidized;
 use App\Models\Device;
-use Illuminate\Support\Str;
+use File;
 use Log;
 
 class DeviceObserver
@@ -59,10 +59,15 @@ public function updated(Device $device): void
     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);