MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2024-12-26 15:15:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect open uuid from f7aa71d

Browse Source
This commit is contained in:
Scott Lamb 2021-10-26 14:40:47 -07:00
parent 7ad5bf56a7
commit caa0878004
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/db/db.rs
View File

@ -2255,7 +2255,7 @@ impl<C: Clocks + Clone> Database<C> {
// Note: the meta check comes after the version check to improve the error message when // Note: the meta check comes after the version check to improve the error message when
// trying to open a version 0 or version 1 database (which lacked the meta table). // trying to open a version 0 or version 1 database (which lacked the meta table).
let (uuid, config) = raw::read_meta(&conn)?; let (db_uuid, config) = raw::read_meta(&conn)?;
let open_monotonic = recording::Time::new(clocks.monotonic()); let open_monotonic = recording::Time::new(clocks.monotonic());
let open = if read_write { let open = if read_write {
let real = recording::Time::new(clocks.realtime()); let real = recording::Time::new(clocks.realtime());
@ -2271,7 +2271,10 @@ impl<C: Clocks + Clone> Database<C> {
}; };
stmt.execute(params![open_uuid, real.0, boot_uuid])?; stmt.execute(params![open_uuid, real.0, boot_uuid])?;
let id = conn.last_insert_rowid() as u32; let id = conn.last_insert_rowid() as u32;
Some(Open { id, uuid }) Some(Open {
id,
uuid: open_uuid.0,
})
} else { } else {
None None
}; };
@ -2280,7 +2283,7 @@ impl<C: Clocks + Clone> Database<C> {
let db = Database { let db = Database {
db: Some(Mutex::new(LockedDatabase { db: Some(Mutex::new(LockedDatabase {
conn, conn,
uuid, uuid: db_uuid,
flush_count: 0, flush_count: 0,
open, open,
open_monotonic, open_monotonic,