Fix login/logout in jobs

This commit is contained in:
Hillel Coren 2017-04-26 09:17:03 +03:00
parent d6607e0165
commit a5e22746fe

View File

@ -54,8 +54,10 @@ class ImportData extends Job implements ShouldQueue
{ {
$includeSettings = false; $includeSettings = false;
Auth::onceUsingId($this->user->id); if (App::runningInConsole()) {
$this->user->account->loadLocalizationSettings(); Auth::onceUsingId($this->user->id);
$this->user->account->loadLocalizationSettings();
}
if ($this->type === IMPORT_JSON) { if ($this->type === IMPORT_JSON) {
$includeData = $this->settings['include_data']; $includeData = $this->settings['include_data'];
@ -77,6 +79,8 @@ class ImportData extends Job implements ShouldQueue
$message = $importService->presentResults($results, $includeSettings); $message = $importService->presentResults($results, $includeSettings);
$userMailer->sendMessage($this->user, $subject, $message); $userMailer->sendMessage($this->user, $subject, $message);
Auth::logout(); if (App::runningInConsole()) {
Auth::logout();
}
} }
} }