move client::pull to server::pull
it's not used by the client and not part of the client, it just makes use *of* the client, but is used on the datastore/server... Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
parent
ea584a7510
commit
aa2838c27a
|
@ -7,10 +7,12 @@ use futures::{select, future::FutureExt};
|
||||||
use proxmox::api::api;
|
use proxmox::api::api;
|
||||||
use proxmox::api::{ApiMethod, Router, RpcEnvironment, Permission};
|
use proxmox::api::{ApiMethod, Router, RpcEnvironment, Permission};
|
||||||
|
|
||||||
use crate::server::{WorkerTask, jobstate::Job};
|
use crate::server::{WorkerTask, jobstate::Job, pull::pull_store};
|
||||||
use crate::backup::DataStore;
|
use crate::backup::DataStore;
|
||||||
use crate::client::{HttpClient, BackupRepository, pull::pull_store};
|
use crate::client::{HttpClient, BackupRepository};
|
||||||
use crate::api2::types::*;
|
use crate::api2::types::{
|
||||||
|
DATASTORE_SCHEMA, REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA, Authid,
|
||||||
|
};
|
||||||
use crate::config::{
|
use crate::config::{
|
||||||
remote,
|
remote,
|
||||||
sync::SyncJobConfig,
|
sync::SyncJobConfig,
|
||||||
|
@ -98,7 +100,7 @@ pub fn do_sync_job(
|
||||||
worker.log(format!("Sync datastore '{}' from '{}/{}'",
|
worker.log(format!("Sync datastore '{}' from '{}/{}'",
|
||||||
sync_job.store, sync_job.remote, sync_job.remote_store));
|
sync_job.store, sync_job.remote, sync_job.remote_store));
|
||||||
|
|
||||||
crate::client::pull::pull_store(&worker, &client, &src_repo, tgt_store.clone(), delete, sync_owner).await?;
|
pull_store(&worker, &client, &src_repo, tgt_store.clone(), delete, sync_owner).await?;
|
||||||
|
|
||||||
worker.log(format!("sync job '{}' end", &job_id));
|
worker.log(format!("sync job '{}' end", &job_id));
|
||||||
|
|
||||||
|
|
|
@ -43,8 +43,6 @@ pub use backup_repo::*;
|
||||||
mod backup_specification;
|
mod backup_specification;
|
||||||
pub use backup_specification::*;
|
pub use backup_specification::*;
|
||||||
|
|
||||||
pub mod pull;
|
|
||||||
|
|
||||||
/// Connect to localhost:8007 as root@pam
|
/// Connect to localhost:8007 as root@pam
|
||||||
///
|
///
|
||||||
/// This automatically creates a ticket if run as 'root' user.
|
/// This automatically creates a ticket if run as 'root' user.
|
||||||
|
|
|
@ -93,6 +93,8 @@ pub mod ticket;
|
||||||
|
|
||||||
pub mod auth;
|
pub mod auth;
|
||||||
|
|
||||||
|
pub mod pull;
|
||||||
|
|
||||||
pub(crate) async fn reload_proxy_certificate() -> Result<(), Error> {
|
pub(crate) async fn reload_proxy_certificate() -> Result<(), Error> {
|
||||||
let proxy_pid = crate::server::read_pid(pbs_buildcfg::PROXMOX_BACKUP_PROXY_PID_FN)?;
|
let proxy_pid = crate::server::read_pid(pbs_buildcfg::PROXMOX_BACKUP_PROXY_PID_FN)?;
|
||||||
let sock = crate::server::ctrl_sock_from_pid(proxy_pid);
|
let sock = crate::server::ctrl_sock_from_pid(proxy_pid);
|
||||||
|
|
Loading…
Reference in New Issue