Merge branch 'master' of github.com:maelstrom-cms/odin

maelstrom-cms · May 19, 2020 · 1ab80bd · 1ab80bd
2 parents a428f58 + a62b260
commit 1ab80bd
Show file tree

Hide file tree

Showing 13 changed files with 1,457 additions and 1,032 deletions.
diff --git a/app/Checkers/Certificate.php b/app/Checkers/Certificate.php
@@ -41,8 +41,11 @@ private function fetch()
             'valid_to' => $certificate->expirationDate(),
             'was_valid' => $certificate->isValid(),
             'did_expire' => $certificate->isExpired(),
+            'grade' => 'N/A',
         ]);
 
+        $this->website->certificates()->save($scan);
+
         $labs = new SslLabs();
 
         $result = $labs->analyze(
@@ -58,7 +61,7 @@ private function fetch()
         foreach ($result->endpoints ?? [] as $endpoint) {
             if ($endpoint->statusMessage === 'Ready') {
                 $scan->grade = $endpoint->grade;
-                $this->website->certificates()->save($scan);
+                $scan->save();
                 $this->scan = $scan;
                 break;
             }

diff --git a/app/HasUptime.php b/app/HasUptime.php
@@ -212,12 +212,18 @@ public function getRecentEventsAttribute()
     public function getTimeSpentOfflineAttribute()
     {
         $events = $this->recent_events;
+        $lastEvent = $events->first();
+
+        if ($lastEvent['state'] !== 'up') {
+            return now()->diffAsCarbonInterval($lastEvent['date'])->forHumans(['join' => true]);
+        }
+
         $downEvent = $events->firstWhere('state', 'down');
 
         if (!$downEvent) {
             return 'Unknown...';
         }
 
-        return $downEvent['duration'];
+        return $lastEvent['date']->diffAsCarbonInterval($downEvent['date'])->forHumans(['join' => true]);
     }
 }
diff --git a/app/Http/Controllers/ProblematicPageController.php b/app/Http/Controllers/ProblematicPageController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use Exception;
-use App\Website;
 use App\CrawledPage;
 use App\Jobs\PageCheck;
+use App\Website;
+use Exception;
+use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Contracts\Routing\ResponseFactory;
 
 class ProblematicPageController extends Controller
 {
@@ -27,7 +27,7 @@ public function __invoke(Request $request, Website $website)
 
         $count = $query->count();
 
-        if ($request->input('refresh',)) {
+        if ($request->input('refresh')) {
             cache()->forget('pages_' . $website->id);
         }
 

diff --git a/app/Http/Controllers/WebsiteController.php b/app/Http/Controllers/WebsiteController.php
@@ -29,6 +29,8 @@ public function __construct()
                     'name' => 'url',
                     'label' => 'Website',
                     'type' => 'EditLinkColumn',
+                    'searchable' => true,
+                    'searchColumn' => 'url',
                 ],
                 [
                     'name' => 'ssl_enabled',
@@ -189,7 +191,7 @@ public function destroy(Website $website)
 
         $this->panel->destroy('Website removed.');
 
-        Artisan::call('horizon:terminate');
+        // Artisan::call('horizon:terminate');
 
         return $this->panel->redirect('index');
     }

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -3,7 +3,9 @@
 namespace App\Providers;
 
 use App\Website;
+use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -26,5 +28,12 @@ public function register()
     public function boot()
     {
         Schema::defaultStringLength(191);
+
+        Queue::failing(function (JobFailed $event) {
+            logger()->error('job failed', [$event]);
+            // $event->connectionName
+            // $event->job
+            // $event->exception
+        });
     }
 }