archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 09:34:05 +00:00
Code Activity

Add ServerManagerTest, fix a lot of bugs

Browse source
This commit is contained in:
Samuel Štancl 2019-02-02 12:08:08 +01:00
parent 35eab00742
commit 5ce0d946ee
6 changed files with 81 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ServerManager.php
View file

@ -18,7 +18,7 @@ class ServerManager
return config('tenancy.server.file.path');
}
return config('tenancy.server.file.path.prefix') . $this->tenantManager('uuid') . config('tenancy.server.file.path.suffix');
return config('tenancy.server.file.path.prefix') . $this->tenantManager->tenant['uuid'] . config('tenancy.server.file.path.suffix');
}
public function create()

1
src/TenancyServiceProvider.php
View file

@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Route;
use Illuminate\Support\ServiceProvider;
use Stancl\Tenancy\Commands\TenantList;
use Stancl\Tenancy\Interfaces\StorageDriver;
use Stancl\Tenancy\Interfaces\ServerConfigManager;
use Stancl\Tenancy\StorageDrivers\RedisStorageDriver;
class TenancyServiceProvider extends ServiceProvider

4
src/TenantManager.php
View file

@ -2,9 +2,9 @@
namespace Stancl\Tenancy;
use Stancl\Tenancy\BootstrapsTenancy;
use Illuminate\Support\Facades\Redis;
use Stancl\Tenancy\Interfaces\StorageDriver;
use Stancl\Tenancy\Traits\BootstrapsTenancy;
class TenantManager
{
@ -77,7 +77,7 @@ class TenantManager
throw new \Exception("Domain $domain is already occupied by tenant $id.");
}
$tenant = $this->storage->createTenant($domain, \Uuid::generate(1, $domain));
$tenant = $this->storage->createTenant($domain, \Webpatser\Uuid\Uuid::generate(1, $domain));
$this->database->create($this->getDatabaseName($tenant));
return $tenant;

6
src/Traits/BootstrapsTenancy.php
View file

@ -1,6 +1,9 @@
<?php
namespace Stancl\Tenancy;
namespace Stancl\Tenancy\Traits;
use Stancl\Tenancy\CacheManager;
use Illuminate\Support\Facades\Redis;
trait BootstrapsTenancy
{
@ -21,7 +24,6 @@ trait BootstrapsTenancy
public function setPhpRedisPrefix($connections = ['default'])
{
return;
foreach ($connections as $connection) {
$prefix = config('tenancy.redis.prefix_base') . $this->tenant['uuid'];
$client = Redis::connection($connection)->client();