From 7ea3b96584354b007caf787fae0525ece3c4ece8 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 18 May 2018 10:07:15 +0200
Subject: [PATCH] fix database definition check
---
lib/AccountManager/App.pm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 07e0de4..042d46e 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -91,16 +91,7 @@ sub new {
);
}
- if ($self->{configuration}->{logger}) {
- AccountManager::DB->register_db(
- driver => $self->{configuration}->{database}->{type},
- database => $self->{configuration}->{database}->{name},
- host => $self->{configuration}->{database}->{host},
- username => $self->{configuration}->{database}->{username},
- password => $self->{configuration}->{database}->{password},
- options => [ split(/, */, $self->{configuration}->{database}->{options}) ]
- );
- } else {
+ if (!$self->{configuration}->{database}) {
$self->{logger}->fatal(
"No database defined in configuration, aborting"
);
@@ -111,6 +102,15 @@ sub new {
errors => [ 'internal' ]
}
);
+ } else {
+ AccountManager::DB->register_db(
+ driver => $self->{configuration}->{database}->{type},
+ database => $self->{configuration}->{database}->{name},
+ host => $self->{configuration}->{database}->{host},
+ username => $self->{configuration}->{database}->{username},
+ password => $self->{configuration}->{database}->{password},
+ options => [ split(/, */, $self->{configuration}->{database}->{options}) ]
+ );
}
$self->{db} = AccountManager::DB->new();
--
GitLab