Skip to content

Commit

Permalink
feat: override watch command in the non-interactive mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@therustmonk
therustmonk committed Mar 14, 2022
1 parent 25dde41 commit 9847ad8
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 56 deletions.
99 changes: 49 additions & 50 deletions applications/tari_base_node/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ use std::{
};

use commands::{
command::{CommandContext, WatchCommand},
command::CommandContext,
parser::Parser,
reader::{CommandEvent, CommandReader},
status_line::StatusLineOutput,
Expand Down Expand Up @@ -286,14 +286,14 @@ async fn run_node(
// Run, node, run!
let context = CommandContext::new(&ctx, shutdown);
if bootstrap.non_interactive_mode {
task::spawn(status_loop(context));
task::spawn(status_loop(context, bootstrap.watch));
println!("Node started in non-interactive mode (pid = {})", process::id());
} else {
info!(
target: LOG_TARGET,
"Node has been successfully configured and initialized. Starting CLI loop."
);
task::spawn(cli_loop(context, bootstrap.watch_mode));
task::spawn(cli_loop(context));
}
if !config.force_sync_peers.is_empty() {
warn!(
Expand Down Expand Up @@ -361,7 +361,7 @@ fn get_status_interval(start_time: Instant, long_interval: Duration) -> time::Sl
time::sleep(duration)
}

async fn status_loop(mut context: CommandContext) {
async fn status_loop(mut context: CommandContext, watch_command: Option<String>) {
let start_time = Instant::now();
let mut shutdown_signal = context.shutdown.to_signal();
let status_interval = context.global_config().base_node_status_line_interval;
Expand All @@ -373,7 +373,13 @@ async fn status_loop(mut context: CommandContext) {
break;
}
_ = interval => {
context.status(StatusLineOutput::Log).await.ok();
if let Some(line) = watch_command.as_ref() {
if let Err(err) = context.handle_command_str(line).await {
println!("Watched command `{}` failed: {}", line, err);
}
} else {
context.status(StatusLineOutput::Log).await.ok();
}
},
}
}
Expand All @@ -386,7 +392,7 @@ async fn status_loop(mut context: CommandContext) {
///
/// ## Returns
/// Doesn't return anything
async fn cli_loop(mut context: CommandContext, watch_mode: bool) {
async fn cli_loop(mut context: CommandContext) {
let parser = Parser::new();
commands::cli::print_banner(parser.get_commands(), 3);

Expand All @@ -407,51 +413,8 @@ async fn cli_loop(mut context: CommandContext, watch_mode: bool) {
let mut software_update_notif = context.software_updater.new_update_notifier().clone();
let mut first_signal = false;
let config = context.config.clone();
let mut watch_task = if watch_mode {
Some(WatchCommand::default())
} else {
None
};
let mut watch_task = None;
loop {
if let Some(command) = watch_task.take() {
let line = command.line();
let interval = command
.interval
.map(Duration::from_secs)
.unwrap_or(config.base_node_status_line_interval);
if let Err(err) = context.handle_command_str(line).await {
println!("Wrong command to watch `{}`. Failed with: {}", line, err);
} else {
loop {
let interval = get_status_interval(start_time, interval);
tokio::select! {
_ = interval => {
if let Err(err) = context.handle_command_str(line).await {
println!("Watched command `{}` failed: {}", line, err);
}
},
_ = signal::ctrl_c() => {
break;
}
// TODO: Is that good idea? Or add a separate command?
Ok(_) = software_update_notif.changed() => {
if let Some(ref update) = *software_update_notif.borrow() {
println!(
"Version {} of the {} is available: {} (sha: {})",
update.version(),
update.app(),
update.download_url(),
update.to_hash_hex()
);
}
}
}
}
}
}
if watch_mode {
break;
}
tokio::select! {
res = reader.next_command() => {
if let Some(event) = res {
Expand Down Expand Up @@ -492,5 +455,41 @@ async fn cli_loop(mut context: CommandContext, watch_mode: bool) {
break;
}
}
if let Some(command) = watch_task.take() {
let line = command.line();
let interval = command
.interval
.map(Duration::from_secs)
.unwrap_or(config.base_node_status_line_interval);
if let Err(err) = context.handle_command_str(line).await {
println!("Wrong command to watch `{}`. Failed with: {}", line, err);
} else {
loop {
let interval = get_status_interval(start_time, interval);
tokio::select! {
_ = interval => {
if let Err(err) = context.handle_command_str(line).await {
println!("Watched command `{}` failed: {}", line, err);
}
},
_ = signal::ctrl_c() => {
break;
}
// TODO: Is that good idea? Or add a separate command?
Ok(_) = software_update_notif.changed() => {
if let Some(ref update) = *software_update_notif.borrow() {
println!(
"Version {} of the {} is available: {} (sha: {})",
update.version(),
update.app(),
update.download_url(),
update.to_hash_hex()
);
}
}
}
}
}
}
}
}
8 changes: 4 additions & 4 deletions common/src/configuration/bootstrap.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ pub struct ConfigBootstrap {
/// Run in non-interactive mode, with no UI.
#[structopt(short, long, alias = "non-interactive")]
pub non_interactive_mode: bool,
/// Run in watch mode (like non-interactive, but with running `watch` command)
#[structopt(long, alias = "watch")]
pub watch_mode: bool,
/// Watch a command in the non-interactive mode.
#[structopt(long)]
pub watch: Option<String>,
/// This will rebuild the db, adding block for block in
#[structopt(long, alias = "rebuild_db")]
pub rebuild_db: bool,
Expand Down Expand Up @@ -189,7 +189,7 @@ impl Default for ConfigBootstrap {
init: false,
create_id: false,
non_interactive_mode: false,
watch_mode: false,
watch: None,
rebuild_db: false,
input_file: None,
command: None,
Expand Down
10 changes: 8 additions & 2 deletions integration_tests/helpers/baseNodeProcess.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class BaseNodeProcess {
});
fs.writeFileSync(
`${this.baseDir}/start_node.sh`,
"export $(grep -v '^#' .env | xargs)\ncargo run --release --bin tari_base_node -- --watch-mode -b ."
"export $(grep -v '^#' .env | xargs)\ncargo run --release --bin tari_base_node -- -n --watch status -b ."
);
const ps = spawn(cmd, args, {
cwd: this.baseDir,
Expand Down Expand Up @@ -203,7 +203,13 @@ class BaseNodeProcess {
}

async start(opts = []) {
const args = ["--watch-mode", "--base-path", "."];
const args = [
"--non-interactive-mode",
"--watch",
"status",
"--base-path",
".",
];
if (this.logFilePath) {
args.push("--log-config", this.logFilePath);
}
Expand Down

0 comments on commit 9847ad8

Please sign in to comment.