Added logging functionality via log4rs crate
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful

This commit is contained in:
Gregory Ballantine 2022-09-01 16:16:27 -04:00
parent 23288ac043
commit 70e2b29121
5 changed files with 28 additions and 8 deletions

View File

@ -8,6 +8,8 @@ license = "BSD 2-Clause"
authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"] authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"]
[dependencies] [dependencies]
log = "0.4"
log4rs = "1.1"
toml = "0.5" toml = "0.5"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"

12
log4rs.yaml Normal file
View File

@ -0,0 +1,12 @@
appenders:
stdout:
kind: console
encoder:
pattern: "{d(%+)(utc)} {h({l})}: {m}{n}"
filters:
- kind: threshold
level: info
root:
level: info
appenders:
- stdout

View File

@ -1,3 +1,4 @@
use log4rs;
use config::Config; use config::Config;
use repository::Repository; use repository::Repository;
use transcoder::Transcoder; use transcoder::Transcoder;
@ -7,6 +8,9 @@ mod repository;
mod transcoder; mod transcoder;
fn main() { fn main() {
// initialize the log4rs logger
log4rs::init_file("./log4rs.yaml", Default::default()).unwrap();
// create and initialize our config and repository objects // create and initialize our config and repository objects
let c: Config = Config::new("~/.config/adept.toml"); let c: Config = Config::new("~/.config/adept.toml");
let r: Repository = Repository::new(&c.get_repository()); let r: Repository = Repository::new(&c.get_repository());

View File

@ -1,5 +1,6 @@
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
use log::{error, info};
pub struct Repository { pub struct Repository {
pub base_dir: String, pub base_dir: String,
@ -53,10 +54,10 @@ impl Repository {
match fs::copy(&ingest_file, &archive_file) { match fs::copy(&ingest_file, &archive_file) {
Ok(_) => { Ok(_) => {
println!("Archiving video file {}.", ingest_file.to_str().unwrap()); info!("Archiving video file {}.", ingest_file.to_str().unwrap());
}, },
Err(e) => { Err(e) => {
eprintln!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), e); error!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), e);
std::process::exit(1); std::process::exit(1);
} }
} }
@ -72,14 +73,14 @@ impl Repository {
fn create_directory(path: &str) { fn create_directory(path: &str) {
let d = Path::new(path); let d = Path::new(path);
if d.is_dir() { if d.is_dir() {
println!("Directory {} already exists.", path); info!("Directory {} already exists.", path);
} else { } else {
match fs::create_dir(path) { match fs::create_dir(path) {
Ok(_) => { Ok(_) => {
println!("Creating directory {}.", path); info!("Creating directory {}.", path);
}, },
Err(e) => { Err(e) => {
eprintln!("Error creating {}: {}", path, e); error!("Error creating {}: {}", path, e);
std::process::exit(1); std::process::exit(1);
} }
} }

View File

@ -1,6 +1,7 @@
use std::path::Path; use std::path::Path;
use std::process; use std::process;
use std::{thread, time}; use std::{thread, time};
use log::{info};
use crate::config::Config; use crate::config::Config;
use crate::repository::Repository; use crate::repository::Repository;
@ -19,7 +20,7 @@ impl Transcoder {
} }
pub fn start(self) { pub fn start(self) {
println!("Starting transcoder..."); info!("Starting transcoder...");
loop { loop {
// search for files in ingest // search for files in ingest
@ -27,7 +28,7 @@ impl Transcoder {
// check if we found any files to transcode // check if we found any files to transcode
if ingest_files.len() < 1 { if ingest_files.len() < 1 {
println!("There were no files found in ingest to transcode; skipping run."); info!("There were no files found in ingest to transcode; skipping run.");
} else { } else {
for i in ingest_files { for i in ingest_files {
// copy the file to the archive // copy the file to the archive
@ -68,6 +69,6 @@ impl Transcoder {
assert!(cmd_output.status.success()); assert!(cmd_output.status.success());
let results_raw = &String::from_utf8_lossy(&cmd_output.stderr); let results_raw = &String::from_utf8_lossy(&cmd_output.stderr);
println!("{}", results_raw); info!("{}", results_raw);
} }
} }