From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup rebase 14/15] move proxmox_restore_daemon code into extra crate
Date: Mon, 20 Sep 2021 14:01:25 +0200 [thread overview]
Message-ID: <1632138649.g6xme55f1c.astroid@nora.none> (raw)
In-Reply-To: <20210920091340.3251578-14-dietmar@proxmox.com>
missing some parts in Cargo.toml (hidden by this never being compiled
standalone):
diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml
index b984958b8..03b0ba4ee 100644
--- a/proxmox-restore-daemon/Cargo.toml
+++ b/proxmox-restore-daemon/Cargo.toml
@@ -19,14 +19,14 @@ nix = "0.19.1"
regex = "1.2"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-tokio = { version = "1.6", features = [] }
+tokio = { version = "1.6", features = ["parking_lot", "sync"] }
tokio-stream = "0.1.0"
tokio-util = { version = "0.6", features = [ "codec", "io" ] }
pathpatterns = "0.1.2"
pxar = { version = "0.10.1", features = [ "tokio-io" ] }
-proxmox = { version = "0.13.2", features = [ "router"] }
+proxmox = { version = "0.13.2", features = [ "router", "sortable-macro" ] }
pbs-api-types = { path = "../pbs-api-types" }
pbs-runtime = { path = "../pbs-runtime" }
On September 20, 2021 11:13 am, Dietmar Maurer wrote:
> ---
> Cargo.toml | 1 +
> Makefile | 4 ++-
> proxmox-restore-daemon/Cargo.toml | 36 +++++++++++++++++++
> .../src/main.rs | 0
> .../src}/proxmox_restore_daemon/api.rs | 0
> .../src}/proxmox_restore_daemon/auth.rs | 0
> .../src}/proxmox_restore_daemon/disk.rs | 0
> .../src}/proxmox_restore_daemon/mod.rs | 0
> .../src}/proxmox_restore_daemon/watchdog.rs | 0
> 9 files changed, 40 insertions(+), 1 deletion(-)
> create mode 100644 proxmox-restore-daemon/Cargo.toml
> rename src/bin/proxmox-restore-daemon.rs => proxmox-restore-daemon/src/main.rs (100%)
> rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/api.rs (100%)
> rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/auth.rs (100%)
> rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/disk.rs (100%)
> rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/mod.rs (100%)
> rename {src/bin => proxmox-restore-daemon/src}/proxmox_restore_daemon/watchdog.rs (100%)
>
> diff --git a/Cargo.toml b/Cargo.toml
> index f2739b91..aadd2c2e 100644
> --- a/Cargo.toml
> +++ b/Cargo.toml
> @@ -35,6 +35,7 @@ members = [
> "proxmox-backup-client",
> "proxmox-backup-debug",
> "proxmox-file-restore",
> + "proxmox-restore-daemon",
> "pxar-bin",
> ]
>
> diff --git a/Makefile b/Makefile
> index 050218ba..79e2dd7c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -47,6 +47,7 @@ SUBCRATES := \
> proxmox-backup-client \
> proxmox-backup-debug \
> proxmox-file-restore \
> + proxmox-restore-daemon \
> pxar-bin
>
> ifeq ($(BUILD_MODE), release)
> @@ -189,11 +190,12 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
> --package pbs-tape \
> --bin pmt \
> --bin pmtx \
> + --package proxmox-restore-daemon \
> + --bin proxmox-restore-daemon \
> --package proxmox-backup \
> --bin dump-catalog-shell-cli \
> --bin proxmox-daily-update \
> --bin proxmox-file-restore \
> - --bin proxmox-restore-daemon \
> --bin proxmox-tape \
> --bin sg-tape-cmd
> touch "$@"
> diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml
> new file mode 100644
> index 00000000..b984958b
> --- /dev/null
> +++ b/proxmox-restore-daemon/Cargo.toml
> @@ -0,0 +1,36 @@
> +[package]
> +name = "proxmox-restore-daemon"
> +version = "0.1.0"
> +authors = ["Proxmox Support Team <support@proxmox.com>"]
> +edition = "2018"
> +description = "Proxmox Restore Daemon"
> +
> +[dependencies]
> +anyhow = "1.0"
> +base64 = "0.12"
> +env_logger = "0.7"
> +futures = "0.3"
> +http = "0.2"
> +hyper = { version = "0.14", features = [ "full" ] }
> +lazy_static = "1.4"
> +libc = "0.2"
> +log = "0.4"
> +nix = "0.19.1"
> +regex = "1.2"
> +serde = { version = "1.0", features = ["derive"] }
> +serde_json = "1.0"
> +tokio = { version = "1.6", features = [] }
> +tokio-stream = "0.1.0"
> +tokio-util = { version = "0.6", features = [ "codec", "io" ] }
> +
> +pathpatterns = "0.1.2"
> +pxar = { version = "0.10.1", features = [ "tokio-io" ] }
> +
> +proxmox = { version = "0.13.2", features = [ "router"] }
> +
> +pbs-api-types = { path = "../pbs-api-types" }
> +pbs-runtime = { path = "../pbs-runtime" }
> +pbs-tools = { path = "../pbs-tools" }
> +pbs-datastore = { path = "../pbs-datastore" }
> +pbs-server = { path = "../pbs-server" }
> +pbs-client = { path = "../pbs-client" }
> diff --git a/src/bin/proxmox-restore-daemon.rs b/proxmox-restore-daemon/src/main.rs
> similarity index 100%
> rename from src/bin/proxmox-restore-daemon.rs
> rename to proxmox-restore-daemon/src/main.rs
> diff --git a/src/bin/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/api.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
> diff --git a/src/bin/proxmox_restore_daemon/auth.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/auth.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/auth.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/auth.rs
> diff --git a/src/bin/proxmox_restore_daemon/disk.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/disk.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs
> diff --git a/src/bin/proxmox_restore_daemon/mod.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/mod.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/mod.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/mod.rs
> diff --git a/src/bin/proxmox_restore_daemon/watchdog.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/watchdog.rs
> similarity index 100%
> rename from src/bin/proxmox_restore_daemon/watchdog.rs
> rename to proxmox-restore-daemon/src/proxmox_restore_daemon/watchdog.rs
> --
> 2.30.2
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
>
next prev parent reply other threads:[~2021-09-20 12:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 9:13 [pbs-devel] [PATCH proxmox-backup rebase 01/15] start new pbs-server workspace Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 02/15] move ApiConfig, FileLogger and CommandoSocket to " Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 03/15] move src/tools/daemon.rs " Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 04/15] move src/server/environment.rs to pbs-server crate Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 05/15] move src/server/formatter.rs " Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 06/15] move src/tools/compression.rs " Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 07/15] move normalize_uri_path and extract_cookie " Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 08/15] rest server: simplify get_index() method signature Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 09/15] make get_index and ApiConfig property (callback) Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 10/15] rest server: return UserInformation from ApiAuth::check_auth Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 11/15] rest server: do not use pbs_api_types::Authid Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 12/15] rest server: cleanup auth-log handling Dietmar Maurer
2021-09-20 10:37 ` Fabian Grünbichler
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 13/15] move src/server/rest.rs to pbs-server crate Dietmar Maurer
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 14/15] move proxmox_restore_daemon code into extra crate Dietmar Maurer
2021-09-20 12:01 ` Fabian Grünbichler [this message]
2021-09-20 9:13 ` [pbs-devel] [PATCH proxmox-backup rebase 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate" Dietmar Maurer
2021-09-20 12:03 ` [pbs-devel] [PATCH proxmox-backup rebase 01/15] start new pbs-server workspace Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1632138649.g6xme55f1c.astroid@nora.none \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox