Benzine/Docker-Swarm-Loadbalancer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More output fiddling.

Browse source
This commit is contained in:
Greyscale 2024-01-25 16:18:06 +01:00
parent 0e3faf1257
commit ff6f67e732
No known key found for this signature in database
GPG key ID: 74BAFF55434DA4B2
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bouncer/src/Bouncer.php
View file

@ -692,11 +692,25 @@ class Bouncer
}
ksort($changedTargets);
$changedTargets = array_values($changedTargets);
// @todo MB: it'd be nice if this'd explode the domains and tree-walk them like:
// com
// |- example
// | |- www
// | |- api
// and so on.
if (count($changedTargets) <= $this->getMaximumNginxConfigCreationNotices()) {
foreach ($changedTargets as $target) {
$this->logger->info('{emoji} Created {label}', ['emoji' => Emoji::pencil(), 'label' => $target->getLabel()]);
$this->logger->debug('{emoji} -> {certs_dir}/{file}', ['emoji' => Emoji::pencil(), 'certs_dir' => Bouncer::FILESYSTEM_CONFIG_DIR, 'file' => $target->getFileName()]);
$this->logger->debug('{emoji} -> {domain}', ['emoji' => Emoji::pencil(), 'domain' => $target->getPresentationDomain()]);
$context = [
'label' => $target->getLabel(),
'domain' => $target->getPresentationdomain(),
'file' => $target->getFileName(),
'config_dir' => Bouncer::FILESYSTEM_CONFIG_DIR,
];
$this->logger->info('{emoji} Created {label}', $context + ['emoji' => Emoji::pencil()]);
$this->logger->debug(' -> {config_dir}/{file}', $context);
$this->logger->debug(' -> {domain}', $context);
}
} else {
$this->logger->info('{emoji} More than {num_max} Nginx configs generated.. Too many to show them all!', ['emoji' => Emoji::pencil(), 'num_max' => $this->getMaximumNginxConfigCreationNotices()]);
@ -716,7 +730,7 @@ class Bouncer
}
if ($target->hasAuth()) {
$authFileHash = $this->configFilesystem->fileExists($target->getAuthFileName()) ? $this->configFilesystem->read($target->getAuthFileName()) : null;
$authFileHash = $this->configFilesystem->fileExists($target->getAuthFileName()) ? $this->configFilesystem->read($target->getAuthFileName() . '.hash') : null;
if ($target->getAuthHash() != $authFileHash) {
$this->configFilesystem->write($target->getAuthFileName() . '.hash', $target->getAuthHash());
$this->configFilesystem->write($target->getAuthFileName(), $target->getAuthFileData());

2
bouncer/src/Target.php
View file

@ -301,7 +301,7 @@ class Target
{
$this->label = $label;
$this->updateLogger();
$this->logger->debug('{emoji} Target label set to {label}', ['emoji' => Emoji::label(), 'label' => $label]);
// $this->logger->debug('{emoji} Target label set to {label}', ['emoji' => Emoji::label(), 'label' => $label]);
return $this;
}