Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
31c6857f
Verified
Commit
31c6857f
authored
4 years ago
by
Joe Donofry
Browse files
Options
Downloads
Patches
Plain Diff
Add some try...catch logic around read-only databases so nheko won't crash if the db doesn't exist
parent
a9c0684a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Cache.cpp
+48
-7
48 additions, 7 deletions
src/Cache.cpp
with
48 additions
and
7 deletions
src/Cache.cpp
+
48
−
7
View file @
31c6857f
...
...
@@ -1580,7 +1580,15 @@ Cache::roomInfo(bool withInvites)
std
::
string
Cache
::
getLastEventId
(
lmdb
::
txn
&
txn
,
const
std
::
string
&
room_id
)
{
auto
orderDb
=
getOrderToMessageDb
(
txn
,
room_id
);
lmdb
::
dbi
orderDb
{
0
};
try
{
orderDb
=
getOrderToMessageDb
(
txn
,
room_id
);
}
catch
(
lmdb
::
runtime_error
&
e
)
{
nhlog
::
db
()
->
error
(
"Can't open db for room '{}', probably doesn't exist yet. ({})"
,
room_id
,
e
.
what
());
return
{};
}
lmdb
::
val
indexVal
,
val
;
...
...
@@ -1626,8 +1634,17 @@ Cache::getTimelineRange(const std::string &room_id)
std
::
optional
<
uint64_t
>
Cache
::
getTimelineIndex
(
const
std
::
string
&
room_id
,
std
::
string_view
event_id
)
{
auto
txn
=
lmdb
::
txn
::
begin
(
env_
,
nullptr
,
MDB_RDONLY
);
auto
orderDb
=
getMessageToOrderDb
(
txn
,
room_id
);
auto
txn
=
lmdb
::
txn
::
begin
(
env_
,
nullptr
,
MDB_RDONLY
);
lmdb
::
dbi
orderDb
{
0
};
try
{
orderDb
=
getOrderToMessageDb
(
txn
,
room_id
);
}
catch
(
lmdb
::
runtime_error
&
e
)
{
nhlog
::
db
()
->
error
(
"Can't open db for room '{}', probably doesn't exist yet. ({})"
,
room_id
,
e
.
what
());
return
{};
}
lmdb
::
val
indexVal
{
event_id
.
data
(),
event_id
.
size
()},
val
;
...
...
@@ -1642,8 +1659,16 @@ Cache::getTimelineIndex(const std::string &room_id, std::string_view event_id)
std
::
optional
<
std
::
string
>
Cache
::
getTimelineEventId
(
const
std
::
string
&
room_id
,
uint64_t
index
)
{
auto
txn
=
lmdb
::
txn
::
begin
(
env_
,
nullptr
,
MDB_RDONLY
);
auto
orderDb
=
getOrderToMessageDb
(
txn
,
room_id
);
auto
txn
=
lmdb
::
txn
::
begin
(
env_
,
nullptr
,
MDB_RDONLY
);
lmdb
::
dbi
orderDb
{
0
};
try
{
orderDb
=
getOrderToMessageDb
(
txn
,
room_id
);
}
catch
(
lmdb
::
runtime_error
&
e
)
{
nhlog
::
db
()
->
error
(
"Can't open db for room '{}', probably doesn't exist yet. ({})"
,
room_id
,
e
.
what
());
return
{};
}
lmdb
::
val
indexVal
{
&
index
,
sizeof
(
index
)},
val
;
...
...
@@ -1658,8 +1683,24 @@ Cache::getTimelineEventId(const std::string &room_id, uint64_t index)
DescInfo
Cache
::
getLastMessageInfo
(
lmdb
::
txn
&
txn
,
const
std
::
string
&
room_id
)
{
auto
orderDb
=
getOrderToMessageDb
(
txn
,
room_id
);
auto
eventsDb
=
getEventsDb
(
txn
,
room_id
);
lmdb
::
dbi
orderDb
{
0
};
try
{
orderDb
=
getOrderToMessageDb
(
txn
,
room_id
);
}
catch
(
lmdb
::
runtime_error
&
e
)
{
nhlog
::
db
()
->
error
(
"Can't open db for room '{}', probably doesn't exist yet. ({})"
,
room_id
,
e
.
what
());
return
{};
}
lmdb
::
dbi
eventsDb
{
0
};
try
{
eventsDb
=
getEventsDb
(
txn
,
room_id
);
}
catch
(
lmdb
::
runtime_error
&
e
)
{
nhlog
::
db
()
->
error
(
"Can't open db for room '{}', probably doesn't exist yet. ({})"
,
room_id
,
e
.
what
());
return
{};
}
if
(
orderDb
.
size
(
txn
)
==
0
)
return
DescInfo
{};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment