diff --git a/mediarepo-daemon/.gitignore b/mediarepo-daemon/.gitignore index 5511304..9995728 100644 --- a/mediarepo-daemon/.gitignore +++ b/mediarepo-daemon/.gitignore @@ -3,4 +3,5 @@ test-local .idea .env tracing.folded -tracing*.svg \ No newline at end of file +tracing*.svg +logs \ No newline at end of file diff --git a/mediarepo-daemon/Cargo.lock b/mediarepo-daemon/Cargo.lock index b1820bd..e5ea826 100644 --- a/mediarepo-daemon/Cargo.lock +++ b/mediarepo-daemon/Cargo.lock @@ -826,29 +826,10 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "mediarepo" -version = "0.1.0" -dependencies = [ - "glob", - "log", - "mediarepo-core", - "mediarepo-model", - "mediarepo-socket", - "num-integer", - "structopt", - "tokio", - "toml", - "tracing", - "tracing-appender", - "tracing-flame", - "tracing-subscriber 0.2.25", -] - [[package]] name = "mediarepo-api" version = "0.1.0" -source = "git+https://github.com/Trivernis/mediarepo-api.git?rev=822abb32a1aa35f209f01a6bafc3106f56d11ddc#822abb32a1aa35f209f01a6bafc3106f56d11ddc" +source = "git+https://github.com/Trivernis/mediarepo-api.git?rev=e5bccc31eaedb1aed5973be98852b9c2632ed62d#e5bccc31eaedb1aed5973be98852b9c2632ed62d" dependencies = [ "chrono", "serde", @@ -875,6 +856,25 @@ dependencies = [ "typemap_rev", ] +[[package]] +name = "mediarepo-daemon" +version = "0.1.0" +dependencies = [ + "glob", + "log", + "mediarepo-core", + "mediarepo-model", + "mediarepo-socket", + "num-integer", + "structopt", + "tokio", + "toml", + "tracing", + "tracing-appender", + "tracing-flame", + "tracing-subscriber 0.2.25", +] + [[package]] name = "mediarepo-database" version = "0.2.0" diff --git a/mediarepo-daemon/Cargo.toml b/mediarepo-daemon/Cargo.toml index 6eb7984..55e2298 100644 --- a/mediarepo-daemon/Cargo.toml +++ b/mediarepo-daemon/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mediarepo" +name = "mediarepo-daemon" version = "0.1.0" edition = "2018" license = "gpl-3" diff --git a/mediarepo-daemon/logs/db_traces.logs b/mediarepo-daemon/logs/db_traces.logs deleted file mode 100644 index f0a05af..0000000 --- a/mediarepo-daemon/logs/db_traces.logs +++ /dev/null @@ -1,78 +0,0 @@ -2021-10-23T15:44:21.613898807+02:00 - PRAGMA page_size = 4096; …; rows: 2, elapsed: 425.678µs - -PRAGMA page_size = 4096; -PRAGMA locking_mode = NORMAL; -PRAGMA journal_mode = WAL; -PRAGMA foreign_keys = ON; -PRAGMA synchronous = FULL; -PRAGMA auto_vacuum = NONE; - -2021-10-23T15:44:21.614073278+02:00 - CREATE TABLE IF NOT …; rows: 0, elapsed: 40.557µs - -CREATE TABLE IF NOT EXISTS _sqlx_migrations ( - version BIGINT PRIMARY KEY, - description TEXT NOT NULL, - installed_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - success BOOLEAN NOT NULL, - checksum BLOB NOT NULL, - execution_time BIGINT NOT NULL -); - -2021-10-23T15:44:21.614185925+02:00 - SELECT version FROM _sqlx_migrations …; rows: 0, elapsed: 66.197µs - -SELECT - version -FROM - _sqlx_migrations -WHERE - success = false -ORDER BY - version -LIMIT - 1 - -2021-10-23T15:44:21.614324891+02:00 - SELECT version, checksum FROM …; rows: 7, elapsed: 81.895µs - -SELECT - version, - checksum -FROM - _sqlx_migrations -ORDER BY - version - -2021-10-23T15:44:21.614983465+02:00 - PRAGMA page_size = 4096; …; rows: 2, elapsed: 309.278µs - -PRAGMA page_size = 4096; -PRAGMA locking_mode = NORMAL; -PRAGMA journal_mode = WAL; -PRAGMA foreign_keys = ON; -PRAGMA synchronous = FULL; -PRAGMA auto_vacuum = NONE; - -2021-10-23T15:44:21.615170159+02:00 - SELECT `storage_locations`.`id`, `storage_locations`.`name`, `storage_locations`.`path` …; rows: 1, elapsed: 85.937µs - -SELECT - `storage_locations`.`id`, - `storage_locations`.`name`, - `storage_locations`.`path` -FROM - `storage_locations` -WHERE - `storage_locations`.`path` = ? -LIMIT - ? - -2021-10-23T15:44:21.615322919+02:00 - SELECT `storage_locations`.`id`, `storage_locations`.`name`, `storage_locations`.`path` …; rows: 1, elapsed: 38.929µs - -SELECT - `storage_locations`.`id`, - `storage_locations`.`name`, - `storage_locations`.`path` -FROM - `storage_locations` -WHERE - `storage_locations`.`path` = ? -LIMIT - ? - diff --git a/mediarepo-daemon/mediarepo-socket/Cargo.lock b/mediarepo-daemon/mediarepo-socket/Cargo.lock index 1c7b68a..8eef875 100644 --- a/mediarepo-daemon/mediarepo-socket/Cargo.lock +++ b/mediarepo-daemon/mediarepo-socket/Cargo.lock @@ -770,7 +770,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "mediarepo-api" version = "0.1.0" -source = "git+https://github.com/Trivernis/mediarepo-api.git?rev=822abb32a1aa35f209f01a6bafc3106f56d11ddc#822abb32a1aa35f209f01a6bafc3106f56d11ddc" +source = "git+https://github.com/Trivernis/mediarepo-api.git?rev=e5bccc31eaedb1aed5973be98852b9c2632ed62d#e5bccc31eaedb1aed5973be98852b9c2632ed62d" dependencies = [ "chrono", "serde", diff --git a/mediarepo-daemon/mediarepo-socket/Cargo.toml b/mediarepo-daemon/mediarepo-socket/Cargo.toml index 0a6ab24..f310273 100644 --- a/mediarepo-daemon/mediarepo-socket/Cargo.toml +++ b/mediarepo-daemon/mediarepo-socket/Cargo.toml @@ -33,4 +33,4 @@ features = ["tokio-executor"] [dependencies.mediarepo-api] git = "https://github.com/Trivernis/mediarepo-api.git" -rev = "822abb32a1aa35f209f01a6bafc3106f56d11ddc" \ No newline at end of file +rev = "e5bccc31eaedb1aed5973be98852b9c2632ed62d" \ No newline at end of file