Skip to content

Commit 7200f3d

Browse files
committed
refactor: move system_services from tedge_config to tedge
Signed-off-by: James Rhodes <jarhodes314@gmail.com>
1 parent 4339fb4 commit 7200f3d

File tree

22 files changed

+23
-26
lines changed

22 files changed

+23
-26
lines changed

crates/common/tedge_config/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pub mod mqtt_config;
22
mod sudo;
3-
pub mod system_services;
43
pub mod tedge_config_cli;
54
pub use sudo::SudoCommandBuilder;
65
pub mod cli;

crates/core/tedge/src/cli/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
use crate::system_services::SystemService;
12
use anyhow::Context;
23
use clap_complete::ArgValueCandidates;
34
use clap_complete::CompletionCandidate;
45
use std::borrow::Cow;
56
use std::fmt;
67
use tedge_config::get_config_dir;
7-
use tedge_config::system_services::SystemService;
88
use tedge_config::ProfileName;
99
use tedge_config::TEdgeConfigLocation;
1010

crates/core/tedge/src/cli/connect/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::cli::connect::*;
33
use crate::command::BuildCommand;
44
use crate::command::BuildContext;
55
use crate::command::Command;
6-
use tedge_config::system_services::service_manager;
6+
use crate::system_services::service_manager;
77

88
#[derive(clap::Args, Debug, Eq, PartialEq)]
99
pub struct TEdgeConnectOpt {

crates/core/tedge/src/cli/connect/command.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use crate::cli::log::Fancy;
1414
use crate::cli::log::Spinner;
1515
use crate::command::Command;
1616
use crate::log::MaybeFancy;
17+
use crate::system_services::*;
1718
use crate::warning;
1819
use crate::ConfigError;
1920
use anyhow::anyhow;
@@ -43,7 +44,6 @@ use tedge_api::mqtt_topics::MqttSchema;
4344
use tedge_api::mqtt_topics::TopicIdError;
4445
use tedge_api::service_health_topic;
4546
use tedge_config::auth_method::AuthType;
46-
use tedge_config::system_services::*;
4747
use tedge_config::TEdgeConfig;
4848
use tedge_config::*;
4949
use tedge_utils::paths::create_directories;

crates/core/tedge/src/cli/connect/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub enum ConnectError {
3131
UrlParse(#[from] url::ParseError),
3232

3333
#[error(transparent)]
34-
SystemServiceError(#[from] tedge_config::system_services::SystemServiceError),
34+
SystemServiceError(#[from] crate::system_services::SystemServiceError),
3535

3636
#[error("Operation timed out. Is mosquitto running?")]
3737
TimeoutElapsedError,

crates/core/tedge/src/cli/disconnect/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::cli::common::CloudArg;
22
use crate::cli::disconnect::disconnect_bridge::*;
33
use crate::command::*;
4-
use tedge_config::system_services::service_manager;
4+
use crate::system_services::service_manager;
55

66
#[derive(clap::Args, Debug)]
77
pub struct TEdgeDisconnectBridgeCli {

crates/core/tedge/src/cli/disconnect/disconnect_bridge.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use crate::cli::log::Fancy;
44
use crate::cli::log::Spinner;
55
use crate::command::*;
66
use crate::log::MaybeFancy;
7+
use crate::system_services::*;
78
use anyhow::Context;
89
use std::sync::Arc;
9-
use tedge_config::system_services::*;
1010
use tedge_config::TEdgeConfigLocation;
1111
use which::which;
1212

crates/core/tedge/src/cli/disconnect/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub enum DisconnectBridgeError {
1010
IoError(#[from] std::io::Error),
1111

1212
#[error(transparent)]
13-
SystemServiceError(#[from] tedge_config::system_services::SystemServiceError),
13+
SystemServiceError(#[from] crate::system_services::SystemServiceError),
1414

1515
#[error(transparent)]
1616
Anyhow(#[from] anyhow::Error),

crates/core/tedge/src/cli/log.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ use std::sync::mpsc;
66
use std::time::Duration;
77
use std::time::Instant;
88

9+
use crate::system_services::SystemServiceError;
10+
use crate::system_services::SystemServiceManager;
911
use camino::Utf8Path;
1012
use tedge_config::auth_method::AuthMethod;
1113
use tedge_config::auth_method::AuthType;
12-
use tedge_config::system_services::SystemServiceError;
13-
use tedge_config::system_services::SystemServiceManager;
1414
use tedge_config::MultiError;
1515
use yansi::Paint as _;
1616

crates/core/tedge/src/cli/reconnect/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::command::ReconnectBridgeCommand;
22
use crate::cli::common::CloudArg;
33
use crate::command::*;
4-
use tedge_config::system_services::service_manager;
4+
use crate::system_services::service_manager;
55

66
#[derive(clap::Args, Debug)]
77
pub struct TEdgeReconnectCli {

0 commit comments

Comments
 (0)