Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add logging to datanymizer #184

Merged
merged 3 commits into from Jul 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### 🚀 Added
- Add the ability to select verbose logging features [#184](https://github.com/datanymizer/datanymizer/pull/184)
([@akirill0v](https://github.com/akirill0v))
- Add the UUID transformer [#180](https://github.com/datanymizer/datanymizer/pull/180)
([@evgeniy-r](https://github.com/evgeniy-r))
- Add the plain text transformer [#177](https://github.com/datanymizer/datanymizer/pull/177)
Expand Down
37 changes: 34 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cli/pg_datanymizer/Cargo.toml
Expand Up @@ -16,5 +16,6 @@ categories = ["command-line-utilities"]
anyhow = "1.0"
datanymizer_dumper = {path = "../../datanymizer_dumper"}
datanymizer_engine = {path = "../../datanymizer_engine"}
env_logger = "0.9.0"
structopt = "0.3.20"
url = "2.2"
12 changes: 12 additions & 0 deletions cli/pg_datanymizer/src/main.rs
Expand Up @@ -9,6 +9,18 @@ mod options;

fn main() -> Result<()> {
let options = Options::from_args();

env_logger::init_from_env(env_logger::Env::default().filter_or(
"RUST_LOG",
match options.verbose {
0 => "error",
1 => "warn",
2 => "info",
3 => "debug",
_ => "trace",
},
));

let app = App::from_options(options)?;
app.run()
}
7 changes: 7 additions & 0 deletions cli/pg_datanymizer/src/options.rs
Expand Up @@ -99,6 +99,13 @@ pub struct Options {
help = "The remaining arguments are passed directly to `pg_dump` calls. You should add `--` before <DBNAME> in such cases"
)]
pub pg_dump_args: Vec<String>,

#[structopt(
parse(from_occurrences),
short = "v",
help = "Turn on verbose logging features to get more information about dumper errors"
)]
pub verbose: u64,
}

impl Options {
Expand Down
1 change: 1 addition & 0 deletions datanymizer_dumper/Cargo.toml
Expand Up @@ -10,6 +10,7 @@ edition = "2021"
datanymizer_engine = { path= "../datanymizer_engine" }
anyhow = "1.0"
indicatif = "0.15.0"
log = "0.4.16"
native-tls = "0.2.7"
postgres = "0.19.1"
postgres-native-tls = "0.5.0"
Expand Down
8 changes: 7 additions & 1 deletion datanymizer_dumper/src/postgres/dumper.rs
Expand Up @@ -5,6 +5,7 @@ use super::{
use crate::{indicator::Indicator, Dumper, SchemaInspector, Table};
use anyhow::Result;
use datanymizer_engine::{Engine, Filter, Settings, TableList};
use log::warn;
use postgres::IsolationLevel;
use std::{
io::{self, prelude::*},
Expand Down Expand Up @@ -97,7 +98,12 @@ impl<W: 'static + Write + Send, I: 'static + Indicator + Send> PgDumper<W, I> {
self.indicator.inc_pb(1);

let row = PgRow::from_string_row(line?, table.clone());
let transformed = row.transform(&self.engine, cfg.name.as_str())?;
let transformed =
row.transform(&self.engine, cfg.name.as_str())
.map_err(|err| {
warn!("{:#?}", err);
err
})?;
self.dump_writer.write_all(transformed.as_bytes())?;
self.dump_writer.write_all(b"\n")?;

Expand Down
1 change: 1 addition & 0 deletions datanymizer_engine/Cargo.toml
Expand Up @@ -12,6 +12,7 @@ bcrypt = "0.12"
config = "0.13"
csv = "1.1"
fake = { version = "2.4.1" }
log = "0.4.16"
once_cell = "1.5.2"
rand = "0.8.4"
serde = { version = "1.0", features = ["derive"] }
Expand Down
10 changes: 9 additions & 1 deletion datanymizer_engine/src/transformers/template/mod.rs
Expand Up @@ -9,6 +9,7 @@ use crate::{
},
Transformers,
};
use log::warn;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use std::{
Expand Down Expand Up @@ -74,7 +75,14 @@ impl TemplateTransformer {
}

fn render(&self, ctx: &Context) -> tera::Result<String> {
self.renderer.render(TEMPLATE_NAME, ctx)
self.renderer.render(TEMPLATE_NAME, ctx).map_err(|err| {
warn!(
"Can't render template: \n---\n{}\n---\nRules: \n{:#?}\nVariables: \n{:#?}",
self.format, self.rules, self.variables
);
warn!("{:#?}", err);
err
})
}
}

Expand Down
1 change: 1 addition & 0 deletions docs/pg_datanymizer.md
Expand Up @@ -16,6 +16,7 @@ pg_datanymizer [OPTIONS] <DBNAME> [PG_DUMP_ARGS]...
| `--accept_invalid_hostnames` | Accept invalid hostnames when using SSL
| `--help` | Prints help information
| `-V`, `--version` | Prints version information
| `-v`, `--verbose` | Turn on verbose logging to show more information about errors

#### OPTIONS

Expand Down