Jędrzej Stuczyński
114d92f93f
* changed NymConfigTemplate trait to call 'template' by reference * network requester lib * introduced generic parameter to 'MixTrafficController' to allow non-remote gateways * allowing for custom gateway sender * types cleanup * minor gateway cmds refactor + initial NR work * wip * running a NR inside gateway note: this NR isnt tied to the gateway yet * rebase fixes * propagating same shutdown handle * wip * starting NR with appropriate local transceiver * fixed premature shutdown * wiring up PacketRouter * both ends wired together * actually working so much cleanup to do now * started removing dead code * wip * temp: hardcode gateway * further cleanup * fixed build of other binaries * setup-network-requester subcmd * overriding NR config in gateway init/run * wip making it wasm-compatible [again] * refactored 'GatewaySetup' * clippy and friends * removed debug code * rust 1.72 lints * ensuring local gateway is available + some comments * correctly putting network requester data in the same underlying details struct * improved gateway errors * changed 'network_requester_config' deserialization * missing clap annotation for 'enabled' flag in 'setup-network-requester' command * saving config file after 'setup-network-requester' * removed dead code * review comments * make embedded NR wait for gateway to come online (for at most 70min) * fixed shutdown on successful gateway wait * updated NR config override
46 lines
1.2 KiB
Rust
46 lines
1.2 KiB
Rust
// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
use clap::ValueEnum;
|
|
use std::fmt::{Display, Formatter};
|
|
|
|
#[derive(Default, Copy, Debug, Clone, ValueEnum)]
|
|
pub enum OutputFormat {
|
|
#[default]
|
|
Text,
|
|
Json,
|
|
}
|
|
|
|
impl Display for OutputFormat {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
OutputFormat::Text => write!(f, "text"),
|
|
OutputFormat::Json => write!(f, "json"),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl OutputFormat {
|
|
pub fn is_text(&self) -> bool {
|
|
matches!(self, OutputFormat::Text)
|
|
}
|
|
|
|
#[cfg(feature = "output_format")]
|
|
pub fn format<T: serde::Serialize + ToString>(&self, data: &T) -> String {
|
|
match self {
|
|
OutputFormat::Text => data.to_string(),
|
|
OutputFormat::Json => serde_json::to_string(data).unwrap(),
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "output_format")]
|
|
pub fn to_stdout<T: serde::Serialize + ToString>(&self, data: &T) {
|
|
println!("{}", self.format(data))
|
|
}
|
|
|
|
#[cfg(feature = "output_format")]
|
|
pub fn to_stderr<T: serde::Serialize + ToString>(&self, data: &T) {
|
|
eprintln!("{}", self.format(data))
|
|
}
|
|
}
|