Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
01a06c9
Add LogTenancyBootstrapper
lukinovec Jul 28, 2025
96a05cd
Fix code style (php-cs-fixer)
github-actions[bot] Jul 28, 2025
43cf6d2
Merge branch 'master' into add-log-bootstrapper
lukinovec Jul 29, 2025
50853a3
Test LogTenancyBootstrapper logic (low-level tests)
lukinovec Jul 29, 2025
b80d7b3
Test real usage with storage path-based channels
lukinovec Jul 29, 2025
a13110c
Test real usage with slack channel (the bootstrapper updates the webh…
lukinovec Jul 29, 2025
718afd3
Simplify the slack channel usage test
lukinovec Jul 29, 2025
a806df0
Stop using real domains in the tests
lukinovec Jul 29, 2025
ec47528
Refactor bootstrapper, make comments more concise
lukinovec Jul 29, 2025
8cd35d3
Add @see to bootstrapper docblock
lukinovec Jul 29, 2025
62a0e39
Delete redundant test, test the same logic in the one larger test
lukinovec Jul 29, 2025
582243c
Clarify test name
lukinovec Jul 29, 2025
bd44036
By default, only override the config if the override tenant property …
lukinovec Jul 31, 2025
63bf4bf
Clarify bootstrapper comments
lukinovec Jul 31, 2025
81daa9d
Simplify test
lukinovec Jul 31, 2025
42c837d
Refactor bootstrapper, provide more info in comments
lukinovec Jul 31, 2025
7bdbe9d
Improve checking if tenant attribute is set
lukinovec Jul 31, 2025
c180c2c
Use more accurate terminology
lukinovec Jul 31, 2025
412c1d0
Merge branch 'master' into add-log-bootstrapper
stancl Aug 25, 2025
0b3f698
Merge branch 'master' into add-log-bootstrapper
lukinovec Oct 28, 2025
f878aaf
Improve closure overrides
lukinovec Oct 29, 2025
b36f3ce
Fix typo
lukinovec Oct 29, 2025
108e0d1
Swap closure param order, add/update comments
lukinovec Oct 29, 2025
e133c87
Make test priovide sufficient context for understanding the default b…
lukinovec Oct 29, 2025
58a2447
Use more direct assertions in the tests that assert the actual behavi…
lukinovec Oct 29, 2025
ae39e4d
Clarify behavior in log bootstrapper comments
lukinovec Oct 29, 2025
39fc72b
Merge branch 'master' into add-log-bootstrapper
stancl Apr 12, 2026
aedb33b
Clean up log files in before/afterEach
lukinovec Apr 13, 2026
c68b91c
Make tests not depend on setting the default logging channel
lukinovec Apr 13, 2026
89b0d1c
Include all storage path channels and overrides in `getChannels()`
lukinovec Apr 13, 2026
9660faf
Ensure Slack throws cURL exception in test
lukinovec Apr 13, 2026
221a995
Support channel overrides using dot notation
lukinovec Apr 13, 2026
f705f58
Fix code style (php-cs-fixer)
github-actions[bot] Apr 13, 2026
697ba65
Correct log file cleanup
lukinovec Apr 13, 2026
b744167
Fix PHPStan error
lukinovec Apr 13, 2026
cdea112
Fix code style (php-cs-fixer)
github-actions[bot] Apr 13, 2026
8fda84f
Throw exception if override closure doesn't return array
lukinovec Apr 13, 2026
34115e8
Rollback config if bootstrap fails
lukinovec Apr 13, 2026
1ae418c
Store configured channels in a property, forget only the stored channels
lukinovec Apr 14, 2026
95fd046
Import InvalidArgumentException
lukinovec Apr 14, 2026
06472d5
Fix code style (php-cs-fixer)
github-actions[bot] Apr 14, 2026
9ea3813
Improve $channelOverrides docblock
lukinovec Apr 14, 2026
23ae15a
Preserve filename from central log path in tenant context
lukinovec Apr 14, 2026
b234308
Add comment about log path customization
lukinovec Apr 14, 2026
42d60e9
Make tenant log channels inherit paths from central config, improve c…
lukinovec Apr 14, 2026
c2a80c2
Fix code style (php-cs-fixer)
github-actions[bot] Apr 14, 2026
2f60e76
Clean up nested log files created by tests
lukinovec Apr 14, 2026
fa075ef
Merge branch 'master' into add-log-bootstrapper
lukinovec Apr 15, 2026
c5683d8
Extract cleanup in test file
lukinovec Apr 21, 2026
8276f3b
Improve comments in tests
lukinovec Apr 21, 2026
6e474ac
Improve comments, test reverting on failure during configuration
lukinovec Apr 21, 2026
55ee7d8
Merge branch 'master' into add-log-bootstrapper
stancl Jun 7, 2026
b51d5ca
clarify language in docblocks
stancl Jun 11, 2026
8107ed4
Fix code style (php-cs-fixer)
github-actions[bot] Jun 11, 2026
dc331bf
Use `data_get()` instead of `getAttribute()` in `overrideChannelConfig`
lukinovec Jun 29, 2026
eaedd4a
Clarify docblocks
lukinovec Jun 29, 2026
68e6fd6
Re-resolve all stack channels that include any of the configured chan…
lukinovec Jun 29, 2026
a6ce0e2
Test that ending tenancy forgets the stack channels properly
lukinovec Jun 29, 2026
e114e1b
update comments, add getBoundCentralStoragePath()
stancl Jul 1, 2026
ce5b363
Merge branch 'master' into add-log-bootstrapper
stancl Jul 1, 2026
f2b7c7d
minor test improvements
stancl Jul 4, 2026
cef7f11
tests: remove comment
stancl Jul 8, 2026
24029f7
rename to LogChannelBootstrapper, add to config
stancl Jul 8, 2026
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
1 change: 1 addition & 0 deletions assets/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
// Bootstrappers\RootUrlBootstrapper::class,
// Bootstrappers\UrlGeneratorBootstrapper::class,
// Bootstrappers\MailConfigBootstrapper::class,
// Bootstrappers\LogChannelBootstrapper::class,
// Bootstrappers\BroadcastingConfigBootstrapper::class,
// Bootstrappers\BroadcastChannelPrefixBootstrapper::class,

Expand Down
6 changes: 6 additions & 0 deletions src/Bootstrappers/FilesystemTenancyBootstrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,10 @@ public function scopeSessions(string|false $suffix): void
$sessionManager->getDrivers()['file']->setHandler($handler);
}
}

/** Get the central storage path from the bound singleton instance of this class. */
public static function getBoundCentralStoragePath(): string
{
return app(static::class)->originalStoragePath;
}
}
215 changes: 215 additions & 0 deletions src/Bootstrappers/LogChannelBootstrapper.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
<?php

declare(strict_types=1);

namespace Stancl\Tenancy\Bootstrappers;

use Closure;
use Illuminate\Contracts\Config\Repository;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Log\LogManager;
use Illuminate\Support\Str;
use InvalidArgumentException;
use Stancl\Tenancy\Contracts\TenancyBootstrapper;
use Stancl\Tenancy\Contracts\Tenant;

/**
* Use tenant-specific logging channels.
*
* Channels included in the $storagePathChannels property will be configured
* to write logs into the tenant's storage directory. The list includes
* Laravel's 'single' and 'daily' channels by default. To customize it,
* see the property's docblock.
*
* For the storage path channels to be scoped correctly:
* - this bootstrapper must run *after* FilesystemTenancyBootstrapper,
* since FilesystemTenancyBootstrapper adjusts storage_path() for the tenant
* - storage path suffixing has to be enabled (= config('tenancy.filesystem.suffix_storage_path')
* must be true), since the storage path suffix is what separates filesystem-based logs
*
* For logging channels that are not filesystem-based, see the $channelOverrides logic.
*
* @see Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper
*/
class LogChannelBootstrapper implements TenancyBootstrapper
{
protected array $defaultConfig = [];

protected array $configuredChannels = [];

/**
* Logging channels whose path is built using storage_path() (e.g. Laravel's 'single' and 'daily').
*
* Channels included here will be configured to use tenant-specific storage paths
* created using storage_path() in the tenant context. Overrides in the $channelOverrides
* property take precedence over $storagePathChannels when a channel is included in both.
*
* Requires FilesystemTenancyBootstrapper to run before this bootstrapper,
* and storage path suffixing to be enabled.
*
* @see Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper
*/
public static array $storagePathChannels = ['single', 'daily'];

/**
* Custom channel configuration overrides.
*
* Channels included here will be configured using the provided override.
* The overrides take precedence over the $storagePathChannels behavior
* when both approaches are used for the same channel.
*
* You can either map tenant attributes to channel config keys using an array,
* or provide a closure that returns the full channel config array.
*
* Examples:
* - Array mapping: ['slack' => ['url' => 'webhookUrl']]
* - this maps $tenant->webhookUrl to slack.url (if $tenant->webhookUrl is null, the override is ignored)
* - Closure: ['slack' => fn (Tenant $tenant, array $channel) => array_merge($channel, ['url' => $tenant->slackUrl])]
* - this manually merges ['url' => $tenant->slackUrl] into the channel's config
* - null is not ignored, the closure controls the override fully
*
* So the channel overrides can be arrays and closures that return arrays.
*/
Comment thread
coderabbitai[bot] marked this conversation as resolved.
public static array $channelOverrides = [];
Comment thread
stancl marked this conversation as resolved.

public function __construct(
protected Repository $config,
protected LogManager $logManager,
) {}

public function bootstrap(Tenant $tenant): void
{
$this->defaultConfig = $this->config->get('logging.channels');
$this->configuredChannels = $this->getChannels();

try {
$this->configureChannels($this->configuredChannels, $tenant);
$this->forgetChannels($this->configuredChannels);
} catch (\Throwable $exception) {
// If an exception is thrown while updating the logging config, the logging config
// could be left in a corrupt state, so we revert to the original config to
// to avoid logging the exception in a tenant channel or a broken channel.
$this->revert();

// We re-throw the exception after having reverted the logging config to central.
throw $exception;
}
}

public function revert(): void
{
$this->config->set('logging.channels', $this->defaultConfig);

$this->forgetChannels($this->configuredChannels);
}

/**
* Channels to configure and forget from the log manager so they can be
* re-resolved with the new, tenant-specific config on the next use.
*
* Includes:
* - all channels in the $storagePathChannels array
* - all channels that have custom overrides in the $channelOverrides property
* - any 'stack' channel that includes one of the above as a member
*
* Stack channels are included because once a stack has been used, it keeps logging
* to wherever its members pointed to at that moment. So a stack used in the central
* context would keep writing to the central logs, even after tenancy is initialized
* and its member channels are configured for the tenant.
* Forgetting the stack forces it to be re-resolved with its members' updated (tenant)
* config.
*
* Importantly, stacks are only inspected one level deep - they are not traversed recursively.
*/
protected function getChannels(): array
{
$configuredChannels = array_unique([
...static::$storagePathChannels,
...array_keys(static::$channelOverrides),
]);

$stackChannels = [];

foreach ($this->config->get('logging.channels') as $channel => $config) {
// Include stack channels that have at least one configured channel as a member
if (($config['driver'] ?? null) === 'stack' && array_intersect($config['channels'] ?? [], $configuredChannels)) {
$stackChannels[] = $channel;
}
}

return array_filter(
array_unique([...$configuredChannels, ...$stackChannels]),
fn (string $channel): bool => $this->config->has("logging.channels.{$channel}")
);
}

/**
* Configure channels for the tenant context.
*
* This handles both $storagePathChannels and $channelOverrides.
*/
protected function configureChannels(array $channels, Tenant $tenant): void
{
foreach ($channels as $channel) {
if (isset(static::$channelOverrides[$channel])) {
$this->overrideChannelConfig($channel, static::$channelOverrides[$channel], $tenant);
} elseif (in_array($channel, static::$storagePathChannels)) {
// Set storage path channels to use a tenant-specific directory.
// The tenant log will be located at e.g. "storage/tenant{$tenantKey}/logs/laravel.log".
$originalChannelPath = $this->config->get("logging.channels.{$channel}.path");
$centralStoragePath = FilesystemTenancyBootstrapper::getBoundCentralStoragePath();

// The tenant log will inherit the segment that follows the storage path from the central channel path config.
// For example, if a channel's path is configured to storage_path('logs/foo.log') (storage/logs/foo.log),
// the 'logs/foo.log' segment will be passed to storage_path() in the tenant context (storage/tenant123/logs/foo.log).
$this->config->set("logging.channels.{$channel}.path", storage_path(Str::after($originalChannelPath, $centralStoragePath)));
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
}

/**
* Update channel configurations per $channelOverrides.
*
* For overrides set in array format, update individual keys of the channel.
* - This ignores cases where the value of the respective tenant attribute is null.
* For overrides set as closures, replace the entire channel with the returned config override.
* - This does not ignore cases where parts of the config may be null - the closure fully controls the override.
*/
protected function overrideChannelConfig(string $channel, array|Closure $override, Tenant $tenant): void
{
if (is_array($override)) {
// Map tenant attributes to channel config keys.
foreach ($override as $configKey => $tenantAttributeName) {
/** @var Tenant&Model $tenant */
$tenantAttribute = data_get($tenant, $tenantAttributeName);

// If the tenant attribute is null, the override is ignored
// and the channel config key's value remains unchanged.
if ($tenantAttribute !== null) {
$this->config->set("logging.channels.{$channel}.{$configKey}", $tenantAttribute);
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
} elseif ($override instanceof Closure) {
$channelConfigKey = "logging.channels.{$channel}";

$result = $override($tenant, $this->config->get($channelConfigKey));

if (! is_array($result)) {
throw new InvalidArgumentException("Channel override closure for '{$channel}' must return an array.");
}

$this->config->set($channelConfigKey, $result);
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

/**
* Forget all passed channels from the log manager so that they can be
* re-resolved with the updated config on the next logging attempt.
*/
protected function forgetChannels(array $channels): void
{
foreach ($channels as $channel) {
$this->logManager->forgetChannel($channel);
}
}
}
Loading
Loading