From 550a5b3c707cb68e20c1a7f9744af3018c008f58 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Tue, 1 Feb 2022 15:34:10 +0100
Subject: [PATCH] avoid spurious warning for undefined database options
---
bin/access-check-manager.pl | 8 ++++++--
bin/update-metadata | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/bin/access-check-manager.pl b/bin/access-check-manager.pl
index 90c5158..a0a1f53 100755
--- a/bin/access-check-manager.pl
+++ b/bin/access-check-manager.pl
@@ -44,7 +44,7 @@ pod2usage(
-verbose => 0
) unless $action;
-my $configuration_file = $ENV{MOJO_CONFIG} || 'conf/manager.conf';
+my $configuration_file = $ENV{ACCESS_CHECK_CONFIG} || 'conf/manager.conf';
my $configuration = Config::Tiny->read($configuration_file);
if (!$configuration) {
die Config::Tiny->errstr() . "\n";
@@ -56,7 +56,11 @@ AccountManager::DB->register_db(
host => $configuration->{database}->{host},
password => $configuration->{database}->{password},
username => $configuration->{database}->{username},
- options => [ split(/, */, $configuration->{database}->{options}) ]
+ options => [
+ $configuration->{database}->{options} ?
+ split(/, */, $configuration->{database}->{options}) :
+ ()
+ ]
);
my $db = AccountManager::DB->new();
diff --git a/bin/update-metadata b/bin/update-metadata
index 0a78257..1f15064 100755
--- a/bin/update-metadata
+++ b/bin/update-metadata
@@ -28,7 +28,7 @@ GetOptions(
-verbose => 0
);
-my $configuration_file = $ENV{MOJO_CONFIG} || 'conf/manager.conf';
+my $configuration_file = $ENV{ACCESS_CHECK_CONFIG} || 'conf/manager.conf';
my $configuration = Config::Tiny->read($configuration_file);
if (!$configuration) {
die Config::Tiny->errstr() . "\n";
@@ -46,7 +46,11 @@ AccountManager::DB->register_db(
host => $configuration->{database}->{host},
password => $configuration->{database}->{password},
username => $configuration->{database}->{username},
- options => [ split(/, */, $configuration->{database}->{options}) ]
+ options => [
+ $configuration->{database}->{options} ?
+ split(/, */, $configuration->{database}->{options}) :
+ ()
+ ]
);
my $db = AccountManager::DB->new();
--
GitLab