From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1BE426B564 for ; Mon, 20 Sep 2021 14:01:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D14E2094C for ; Mon, 20 Sep 2021 14:01:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E2A2B20940 for ; Mon, 20 Sep 2021 14:01:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AD2AE449AE for ; Mon, 20 Sep 2021 14:01:35 +0200 (CEST) Date: Mon, 20 Sep 2021 14:01:25 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20210920091340.3251578-1-dietmar@proxmox.com> <20210920091340.3251578-14-dietmar@proxmox.com> In-Reply-To: <20210920091340.3251578-14-dietmar@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1632138649.g6xme55f1c.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.358 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup rebase 14/15] move proxmox_restore_daemon code into extra crate X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2021 12:01:37 -0000 missing some parts in Cargo.toml (hidden by this never being compiled=20 standalone): diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Car= go.toml index b984958b8..03b0ba4ee 100644 --- a/proxmox-restore-daemon/Cargo.toml +++ b/proxmox-restore-daemon/Cargo.toml @@ -19,14 +19,14 @@ nix =3D "0.19.1" regex =3D "1.2" serde =3D { version =3D "1.0", features =3D ["derive"] } serde_json =3D "1.0" -tokio =3D { version =3D "1.6", features =3D [] } +tokio =3D { version =3D "1.6", features =3D ["parking_lot", "sync"] } tokio-stream =3D "0.1.0" tokio-util =3D { version =3D "0.6", features =3D [ "codec", "io" ] } =20 pathpatterns =3D "0.1.2" pxar =3D { version =3D "0.10.1", features =3D [ "tokio-io" ] } =20 -proxmox =3D { version =3D "0.13.2", features =3D [ "router"] } +proxmox =3D { version =3D "0.13.2", features =3D [ "router", "sortable-mac= ro" ] } =20 pbs-api-types =3D { path =3D "../pbs-api-types" } pbs-runtime =3D { path =3D "../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 =3D> proxmox-restore-daemon/src= /main.rs (100%) > rename {src/bin =3D> proxmox-restore-daemon/src}/proxmox_restore_daemon/= api.rs (100%) > rename {src/bin =3D> proxmox-restore-daemon/src}/proxmox_restore_daemon/= auth.rs (100%) > rename {src/bin =3D> proxmox-restore-daemon/src}/proxmox_restore_daemon/= disk.rs (100%) > rename {src/bin =3D> proxmox-restore-daemon/src}/proxmox_restore_daemon/= mod.rs (100%) > rename {src/bin =3D> proxmox-restore-daemon/src}/proxmox_restore_daemon/= watchdog.rs (100%) >=20 > diff --git a/Cargo.toml b/Cargo.toml > index f2739b91..aadd2c2e 100644 > --- a/Cargo.toml > +++ b/Cargo.toml > @@ -35,6 +35,7 @@ members =3D [ > "proxmox-backup-client", > "proxmox-backup-debug", > "proxmox-file-restore", > + "proxmox-restore-daemon", > "pxar-bin", > ] > =20 > diff --git a/Makefile b/Makefile > index 050218ba..79e2dd7c 100644 > --- a/Makefile > +++ b/Makefile > @@ -47,6 +47,7 @@ SUBCRATES :=3D \ > proxmox-backup-client \ > proxmox-backup-debug \ > proxmox-file-restore \ > + proxmox-restore-daemon \ > pxar-bin > =20 > ifeq ($(BUILD_MODE), release) > @@ -189,11 +190,12 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-c= li $(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/C= argo.toml > new file mode 100644 > index 00000000..b984958b > --- /dev/null > +++ b/proxmox-restore-daemon/Cargo.toml > @@ -0,0 +1,36 @@ > +[package] > +name =3D "proxmox-restore-daemon" > +version =3D "0.1.0" > +authors =3D ["Proxmox Support Team "] > +edition =3D "2018" > +description =3D "Proxmox Restore Daemon" > + > +[dependencies] > +anyhow =3D "1.0" > +base64 =3D "0.12" > +env_logger =3D "0.7" > +futures =3D "0.3" > +http =3D "0.2" > +hyper =3D { version =3D "0.14", features =3D [ "full" ] } > +lazy_static =3D "1.4" > +libc =3D "0.2" > +log =3D "0.4" > +nix =3D "0.19.1" > +regex =3D "1.2" > +serde =3D { version =3D "1.0", features =3D ["derive"] } > +serde_json =3D "1.0" > +tokio =3D { version =3D "1.6", features =3D [] } > +tokio-stream =3D "0.1.0" > +tokio-util =3D { version =3D "0.6", features =3D [ "codec", "io" ] } > + > +pathpatterns =3D "0.1.2" > +pxar =3D { version =3D "0.10.1", features =3D [ "tokio-io" ] } > + > +proxmox =3D { version =3D "0.13.2", features =3D [ "router"] } > + > +pbs-api-types =3D { path =3D "../pbs-api-types" } > +pbs-runtime =3D { path =3D "../pbs-runtime" } > +pbs-tools =3D { path =3D "../pbs-tools" } > +pbs-datastore =3D { path =3D "../pbs-datastore" } > +pbs-server =3D { path =3D "../pbs-server" } > +pbs-client =3D { path =3D "../pbs-client" } > diff --git a/src/bin/proxmox-restore-daemon.rs b/proxmox-restore-daemon/s= rc/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-daem= on/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-dae= mon/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-dae= mon/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-daem= on/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 > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20