Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.x] Handle redis connection exception on DumpWatcher register #1296

Merged
merged 7 commits into from
Jan 30, 2023
Merged

[4.x] Handle redis connection exception on DumpWatcher register #1296

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c309c6
Handle redis connection exception on DumpWatcher register
aidanthewiz Jan 29, 2023
92353f4
Cleanup after previous solution removed
aidanthewiz Jan 30, 2023
233a786
Include another case and refactor
aidanthewiz Jan 30, 2023
449760e
Add missing !
aidanthewiz Jan 30, 2023
a3c3992
Update src/Telescope.php
driesvints Jan 30, 2023
b1aa8a8
Update src/Watchers/DumpWatcher.php
driesvints Jan 30, 2023
9152e09
use Exception
aidanthewiz Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/Telescope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,15 @@ public static function startRecording($loadMonitoredTags = true)
app(EntriesRepository::class)->loadMonitoredTags();
}

static::$shouldRecord = ! cache('telescope:pause-recording');
$recordingPaused = false;

try {
$recordingPaused = cache('telescope:pause-recording');
} catch (\Exception) {
aidanthewiz marked this conversation as resolved.
Show resolved Hide resolved
//
}

static::$shouldRecord = ! $recordingPaused;
}

/**
Expand Down
9 changes: 8 additions & 1 deletion src/Watchers/DumpWatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@ public function __construct(CacheFactory $cache, array $options = [])
*/
public function register($app)
{
if (! ($this->options['always'] ?? false) && ! $this->cache->get('telescope:dump-watcher')) {
$dumpWatcherCache = false;
try {
driesvints marked this conversation as resolved.
Show resolved Hide resolved
$dumpWatcherCache = $this->cache->get('telescope:dump-watcher');
} catch (\Exception) {
//
}

if (! ($this->options['always'] ?? false) && ! $dumpWatcherCache) {
return;
}

Expand Down