Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 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
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
197 changes: 197 additions & 0 deletions src/Bootstrappers/LogTenancyBootstrapper.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
<?php

declare(strict_types=1);

namespace Stancl\Tenancy\Bootstrappers;

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

/**
* This bootstrapper makes it possible to configure tenant-specific logging.
*
* By default, all the storage path channels are configured to use tenant
* storage directories (see the $storagePathChannels property).
*
* For this to work correctly:
* - this bootstrapper must run *after* FilesystemTenancyBootstrapper,
* since FilesystemTenancyBootstrapper alters how storage_path() works in the tenant context
* - storage path suffixing has to be enabled (= config('tenancy.filesystem.suffix_storage_path')
* has to be true), since the storage path suffix is what separates logs by tenant
*
* The bootstrapper also supports custom channel overrides via the $channelOverrides property (see the property's docblock).
*
* @see Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper
*/
class LogTenancyBootstrapper implements TenancyBootstrapper
{
protected array $defaultConfig = [];

protected array $configuredChannels = [];

/**
* Logging channels that use the storage_path() helper for storing the logs.
* Or you can bypass this default behavior by using overrides, since they take
* precedence over the default behavior.
*
* All channels included here will be configured to use tenant-specific storage paths.
*
* 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.
*
* All channels included here will be configured using the provided override.
* The overrides take precedence over the default storage path channels
* behavior.
*
* Examples:
* - Array mapping (the default approach): ['slack' => ['url' => 'webhookUrl']]
* - this maps $tenant->webhookUrl to slack.url (if $tenant->webhookUrl is not null, otherwise, the override is ignored)
* - Closure: ['slack' => fn (Tenant $tenant, array $channel) => array_merge($channel, ['url' => $tenant->slackUrl])]
* - this merges ['url' => $tenant->slackUrl] into the channel's config.
*
* 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 on lines +53 to +68
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the key in this array is e.g. slack, and we can provide either a "partial array override" or a closure that returns the override dynamically based on $tenant, why would the closure approach be:

function (Config\Repository $config, Tenant $tenant): void {
    $config->set('something', something based on $tenant);
}

As opposed to returning a value that'd directly override the channel:

function (array $channel, Tenant $tenant): array {
    return array_merge($channel, [overrides based on $tenant]);
}

The current approach would let you do for instance $channelOverrides['foo'] = fn ($config, $tenant) => $config->set('bar', ...) which doesn't make sense. And requiring the user to do $config->set() manually in the first place is unnecessary complexity for the user.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be resolved now f878aaf

Copy link
Copy Markdown
Contributor Author

@lukinovec lukinovec Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swapped the parameter order. Example for current usage of overrides:

LogTenancyBootstrapper::$channelOverrides = [
        'single' => function (Tenant $tenant, array $channel) {
            return array_merge($channel, ['path' => storage_path("logs/override-{$tenant->id}.log")]);
        },
];

Also updated the comments to clarify the bootstrapper's behavior. So I think this review can be resolved now


public function __construct(
protected Config $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) {
// Revert to default config if anything goes wrong during channel configuration
$this->config->set('logging.channels', $this->defaultConfig);
$this->forgetChannels($this->configuredChannels);

throw $exception;
}
}

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

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

/**
* Channels to configure and forget so they can be re-resolved afterwards.
*
* Includes:
* - the default channel
* - all channels in the $storagePathChannels array
* - all channels that have custom overrides in the $channelOverrides property
*/
protected function getChannels(): array
{
/**
* Include the default channel in the list of channels to configure/re-resolve.
*
* Including the default channel is harmless (if it's not overridden or not in $storagePathChannels,
* it'll just be forgotten and re-resolved on the next use), and for the case where 'stack' is the default,
* this is necessary since the 'stack' channel will be resolved and saved in the log manager,
* and its stale config could accidentally be used instead of the stack member channels.
*
* For example, when you use 'stack' with the 'slack' channel and you want to configure the webhook URL,
* both 'stack' and 'slack' must be re-resolved after updating the config for the channels to use the correct webhook URLs.
* If only one of the mentioned channels would be re-resolved, the other's (stale) webhook URL could be used for logging.
*/
$defaultChannel = $this->config->get('logging.default');

return array_filter(
array_unique([
$defaultChannel,
...static::$storagePathChannels,
...array_keys(static::$channelOverrides),
]),
fn (string $channel): bool => $this->config->has("logging.channels.{$channel}")
);
}

/**
* Configure channels for the tenant context.
*
* Only the channels that are in the $storagePathChannels array
* or have custom overrides in the $channelOverrides property
* will be configured.
*/
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 tenant-specific directory (default behavior).
// The tenant log will be located at e.g. "storage/tenant{$tenantKey}/logs/laravel.log"
// (assuming FilesystemTenancyBootstrapper is used before this bootstrapper).
$originalChannelPath = $this->config->get("logging.channels.{$channel}.path");
$centralStoragePath = Str::before(storage_path(), $this->config->get('tenancy.filesystem.suffix_base') . $tenant->getTenantKey());

// 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('custom/logs/path.log') (storage/custom/logs/path.log),
// the 'custom/logs/path.log' segment will be passed to storage_path() in the tenant context (storage/tenantfoo/custom/logs/path.log).
$this->config->set("logging.channels.{$channel}.path", storage_path(Str::after($originalChannelPath, $centralStoragePath)));
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
}

protected function overrideChannelConfig(string $channel, array|Closure $override, Tenant $tenant): void
{
if (is_array($override)) {
// Map tenant attributes to channel config keys.
// If the tenant attribute is null,
// the override is ignored and the channel config key's value remains unchanged.
foreach ($override as $configKey => $tenantAttributeName) {
/** @var Tenant&Model $tenant */
$tenantAttribute = Arr::get($tenant, $tenantAttributeName);

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 so they can be re-resolved
* with updated config on the next logging attempt.
*/
protected function forgetChannels(array $channels): void
{
foreach ($channels as $channel) {
$this->logManager->forgetChannel($channel);
}
}
}
Loading
Loading