agave-validator: extract monitor

validator/src/cli.rs

@@ -1875,7 +1875,7 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
         .subcommand(
             SubCommand::with_name("init").about("Initialize the ledger directory then exit"),
         )
-        .subcommand(SubCommand::with_name("monitor").about("Monitor the validator"))
+        .subcommand(commands::monitor::command(default_args))
         .subcommand(SubCommand::with_name("run").about("Run the validator"))
         .subcommand(
             SubCommand::with_name("plugin")

validator/src/commands/mod.rs

@@ -1,2 +1,3 @@
 pub mod authorized_voter;
+pub mod monitor;
 pub mod wait_for_restart_window;

validator/src/commands/monitor/mod.rs

@@ -0,0 +1,25 @@
+use {
+    crate::{cli::DefaultArgs, dashboard::Dashboard},
+    clap::{App, ArgMatches, SubCommand},
+    std::{path::Path, process::exit, time::Duration},
+};
+
+pub fn command(_default_args: &DefaultArgs) -> App<'_, '_> {
+    SubCommand::with_name("monitor").about("Monitor the validator")
+}
+
+pub fn execute(_matches: &ArgMatches, ledger_path: &Path) {
+    monitor_validator(ledger_path);
+}
+
+pub fn monitor_validator(ledger_path: &Path) {
+    let dashboard = Dashboard::new(ledger_path, None, None).unwrap_or_else(|err| {
+        println!(
+            "Error: Unable to connect to validator at {}: {:?}",
+            ledger_path.display(),
+            err,
+        );
+        exit(1);
+    });
+    dashboard.run(Duration::from_secs(2));
+}

validator/src/main.rs

@@ -7,9 +7,7 @@ use {
         admin_rpc_service::{load_staked_nodes_overrides, StakedNodesOverrides},
         bootstrap,
         cli::{self, app, warn_for_deprecated_arguments, DefaultArgs},
-        commands,
-        dashboard::Dashboard,
-        ledger_lockfile, lock_ledger, redirect_stderr_to_file,
+        commands, ledger_lockfile, lock_ledger, redirect_stderr_to_file,
     },
     clap::{crate_name, value_t, value_t_or_exit, values_t, values_t_or_exit, ArgMatches},
     crossbeam_channel::unbounded,
@@ -98,18 +96,6 @@ enum Operation {
 
 const MILLIS_PER_SECOND: u64 = 1000;
 
-fn monitor_validator(ledger_path: &Path) {
-    let dashboard = Dashboard::new(ledger_path, None, None).unwrap_or_else(|err| {
-        println!(
-            "Error: Unable to connect to validator at {}: {:?}",
-            ledger_path.display(),
-            err,
-        );
-        exit(1);
-    });
-    dashboard.run(Duration::from_secs(2));
-}
-
 fn set_repair_whitelist(
     ledger_path: &Path,
     whitelist: Vec<Pubkey>,
@@ -337,12 +323,12 @@ pub fn main() {
             println!("Exit request sent");
 
             if monitor {
-                monitor_validator(&ledger_path);
+                commands::monitor::monitor_validator(&ledger_path);
             }
             return;
         }
         ("monitor", _) => {
-            monitor_validator(&ledger_path);
+            commands::monitor::execute(&matches, &ledger_path);
             return;
         }
         ("staked-nodes-overrides", Some(subcommand_matches)) => {