Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 04:07:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5796 from turbo124/v5-develop

Browse Source 
Fixes for Multi DB and Livewire.
This commit is contained in:
David Bomba 2021-05-24 07:53:45 +10:00 committed by GitHub
commit 686faea948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Providers/AppServiceProvider.php
View File

@ -11,8 +11,8 @@
namespace App\Providers; namespace App\Providers;
use App\Http\Middleware\SetDomainNameDb;
use App\Models\Account; use App\Models\Account;
use App\Models\Subscription;
use App\Models\Client; use App\Models\Client;
use App\Models\Company; use App\Models\Company;
use App\Models\CompanyGateway; use App\Models\CompanyGateway;
@ -24,10 +24,10 @@ use App\Models\Payment;
use App\Models\Product; use App\Models\Product;
use App\Models\Proposal; use App\Models\Proposal;
use App\Models\Quote; use App\Models\Quote;
use App\Models\Subscription;
use App\Models\Task; use App\Models\Task;
use App\Models\User; use App\Models\User;
use App\Observers\AccountObserver; use App\Observers\AccountObserver;
use App\Observers\SubscriptionObserver;
use App\Observers\ClientObserver; use App\Observers\ClientObserver;
use App\Observers\CompanyGatewayObserver; use App\Observers\CompanyGatewayObserver;
use App\Observers\CompanyObserver; use App\Observers\CompanyObserver;
@ -39,8 +39,10 @@ use App\Observers\PaymentObserver;
use App\Observers\ProductObserver; use App\Observers\ProductObserver;
use App\Observers\ProposalObserver; use App\Observers\ProposalObserver;
use App\Observers\QuoteObserver; use App\Observers\QuoteObserver;
use App\Observers\SubscriptionObserver;
use App\Observers\TaskObserver; use App\Observers\TaskObserver;
use App\Observers\UserObserver; use App\Observers\UserObserver;
use App\Utils\Ninja;
use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Queue\Events\JobProcessing; use Illuminate\Queue\Events\JobProcessing;
@ -49,6 +51,7 @@ use Illuminate\Support\Facades\Queue;
use Illuminate\Support\Facades\RateLimiter; use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Livewire\Livewire;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
{ {
@ -93,6 +96,15 @@ class AppServiceProvider extends ServiceProvider
Task::observe(TaskObserver::class); Task::observe(TaskObserver::class);
User::observe(UserObserver::class); User::observe(UserObserver::class);
/* Handles setting the correct database with livewire classes */
if(Ninja::isHosted())
{
Livewire::addPersistentMiddleware([
SetDomainNameDb::class,
]);
}
// Queue::before(function (JobProcessing $event) { // Queue::before(function (JobProcessing $event) {
// // \Log::info('Event Job '.$event->connectionName); // // \Log::info('Event Job '.$event->connectionName);
// \Log::error('Event Job '.$event->job->getJobId); // \Log::error('Event Job '.$event->job->getJobId);