Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
4c1b9abe
Commit
4c1b9abe
authored
Jul 12, 2016
by
louiz’
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly catch and handle database errors
Do not use a singleton for the database. fix #3203
parent
03feb403
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
40 deletions
+47
-40
louloulibs/utils/reload.cpp
louloulibs/utils/reload.cpp
+18
-1
louloulibs/utils/reload.hpp
louloulibs/utils/reload.hpp
+1
-7
src/database/database.cpp
src/database/database.cpp
+15
-18
src/database/database.hpp
src/database/database.hpp
+3
-3
src/main.cpp
src/main.cpp
+9
-10
tests/database.cpp
tests/database.cpp
+1
-1
No files found.
louloulibs/utils/reload.cpp
View file @
4c1b9abe
#include <utils/reload.hpp>
#include <database/database.hpp>
#include <config/config.hpp>
#include <utils/xdg.hpp>
#include <logger/logger.hpp>
void
open_database
()
{
const
auto
db_filename
=
Config
::
get
(
"db_name"
,
xdg_data_path
(
"biboumi.sqlite"
));
log_info
(
"Opening database: "
,
db_filename
);
Database
::
open
(
db_filename
);
log_info
(
"database successfully opened."
);
}
void
reload_process
()
{
Config
::
read_conf
();
// Destroy the logger instance, to be recreated the next time a log
// line needs to be written
Logger
::
instance
().
reset
();
log_debug
(
"Configuration and logger reloaded."
);
log_info
(
"Configuration and logger reloaded."
);
try
{
open_database
();
}
catch
(
const
litesql
::
DatabaseError
&
)
{
log_warning
(
"Re-using the previous database."
);
}
}
louloulibs/utils/reload.hpp
View file @
4c1b9abe
#pragma once
/**
* Reload the server's configuration, and close the logger (so that it
* closes its files etc, to take into account the new configuration)
*/
void
open_database
();
void
reload_process
();
src/database/database.cpp
View file @
4c1b9abe
...
...
@@ -2,8 +2,6 @@
#ifdef USE_DATABASE
#include <database/database.hpp>
#include <config/config.hpp>
#include <utils/xdg.hpp>
#include <logger/logger.hpp>
#include <string>
...
...
@@ -11,37 +9,36 @@ using namespace std::string_literals;
std
::
unique_ptr
<
db
::
BibouDB
>
Database
::
db
;
db
::
BibouDB
&
Database
::
get_db
(
)
void
Database
::
open
(
const
std
::
string
&
filename
,
const
std
::
string
&
db_type
)
{
if
(
!
Database
::
db
)
try
{
const
std
::
string
db_filename
=
Config
::
get
(
"db_name"
,
xdg_data_path
(
"biboumi.sqlite"
));
Database
::
db
=
std
::
make_unique
<
db
::
BibouDB
>
(
"sqlite3"
,
"database="
s
+
db_filename
);
auto
new_db
=
std
::
make_unique
<
db
::
BibouDB
>
(
db_type
,
"database="
s
+
filename
);
if
(
new_db
->
needsUpgrade
())
new_db
->
upgrade
();
Database
::
db
.
reset
(
new_db
.
release
());
}
catch
(
const
litesql
::
DatabaseError
&
e
)
{
log_error
(
"Failed to open database "
,
filename
,
". "
,
e
.
what
());
throw
;
}
if
(
Database
::
db
->
needsUpgrade
())
Database
::
db
->
upgrade
();
return
*
Database
::
db
.
get
();
}
void
Database
::
set_verbose
(
const
bool
val
)
{
Database
::
get_db
().
verbose
=
val
;
Database
::
db
->
verbose
=
val
;
}
db
::
IrcServerOptions
Database
::
get_irc_server_options
(
const
std
::
string
&
owner
,
const
std
::
string
&
server
)
{
try
{
auto
options
=
litesql
::
select
<
db
::
IrcServerOptions
>
(
Database
::
get_db
()
,
auto
options
=
litesql
::
select
<
db
::
IrcServerOptions
>
(
*
Database
::
db
,
db
::
IrcServerOptions
::
Owner
==
owner
&&
db
::
IrcServerOptions
::
Server
==
server
).
one
();
return
options
;
}
catch
(
const
litesql
::
NotFound
&
e
)
{
db
::
IrcServerOptions
options
(
Database
::
get_db
()
);
db
::
IrcServerOptions
options
(
*
Database
::
db
);
options
.
owner
=
owner
;
options
.
server
=
server
;
// options.update();
...
...
@@ -54,13 +51,13 @@ db::IrcChannelOptions Database::get_irc_channel_options(const std::string& owner
const
std
::
string
&
channel
)
{
try
{
auto
options
=
litesql
::
select
<
db
::
IrcChannelOptions
>
(
Database
::
get_db
()
,
auto
options
=
litesql
::
select
<
db
::
IrcChannelOptions
>
(
*
Database
::
db
,
db
::
IrcChannelOptions
::
Owner
==
owner
&&
db
::
IrcChannelOptions
::
Server
==
server
&&
db
::
IrcChannelOptions
::
Channel
==
channel
).
one
();
return
options
;
}
catch
(
const
litesql
::
NotFound
&
e
)
{
db
::
IrcChannelOptions
options
(
Database
::
get_db
()
);
db
::
IrcChannelOptions
options
(
*
Database
::
db
);
options
.
owner
=
owner
;
options
.
server
=
server
;
options
.
channel
=
channel
;
...
...
src/database/database.hpp
View file @
4c1b9abe
...
...
@@ -26,7 +26,7 @@ public:
template
<
typename
PersistentType
>
static
size_t
count
()
{
return
litesql
::
select
<
PersistentType
>
(
Database
::
get_db
()
).
count
();
return
litesql
::
select
<
PersistentType
>
(
*
Database
::
db
).
count
();
}
/**
* Return the object from the db. Create it beforehand (with all default
...
...
@@ -42,11 +42,11 @@ public:
const
std
::
string
&
channel
);
static
void
close
();
static
void
open
(
const
std
::
string
&
filename
,
const
std
::
string
&
db_type
=
"sqlite3"
);
private:
static
std
::
unique_ptr
<
db
::
BibouDB
>
db
;
static
db
::
BibouDB
&
get_db
();
};
#endif
/* USE_DATABASE */
...
...
src/main.cpp
View file @
4c1b9abe
...
...
@@ -3,22 +3,15 @@
#include <network/poller.hpp>
#include <config/config.hpp>
#include <logger/logger.hpp>
#include <utils/reload.hpp>
#include <utils/xdg.hpp>
#include <iostream>
#include <memory>
#include <atomic>
#include <signal.h>
#include <utils/reload.hpp>
#ifdef CARES_FOUND
# include <network/dns_handler.hpp>
#endif
#ifdef SYSTEMD_FOUND
# include <systemd/sd-daemon.h>
#endif
#include <atomic>
#include <signal.h>
// A flag set by the SIGINT signal handler.
static
volatile
std
::
atomic
<
bool
>
stop
(
false
);
...
...
@@ -71,6 +64,12 @@ int main(int ac, char** av)
if
(
hostname
.
empty
())
return
config_help
(
"hostname"
);
try
{
open_database
();
}
catch
(...)
{
return
1
;
}
// Block the signals we want to manage. They will be unblocked only during
// the epoll_pwait or ppoll calls. This avoids some race conditions,
// explained in man 2 pselect on linux
...
...
tests/database.cpp
View file @
4c1b9abe
...
...
@@ -7,7 +7,7 @@
TEST_CASE
(
"Database"
)
{
#ifdef USE_DATABASE
Config
::
set
(
"db_name"
,
":memory:"
);
Database
::
open
(
":memory:"
);
Database
::
set_verbose
(
false
);
SECTION
(
"Basic retrieve and update"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment