github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 18:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): fix counting / exporting / clearing log files (#3535)

Browse Source 
Closes #3531

I refactored it so that all the log-related files pull their path from
one function, so hopefully they won't skew in the future. The path could
still be wrong though. A smoke test might be able to catch that: #3534
This commit is contained in:
Reactor Scram
2024-02-02 11:28:01 -06:00
committed by GitHub
parent 1e596ce5d9
commit 8ae57e85fc
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rust/windows-client/src-tauri/src/client/logging.rs
View File

@@ -33,12 +33,9 @@ pub(crate) enum Error {
SetLogger(#[from] tracing_log::log_tracer::SetLoggerError),
}
/// Set up logs for the first time.
/// Set up logs after the process has started
pub(crate) fn setup(log_filter: &str) -> Result<Handles, Error> {
let log_path = app_local_data_dir()
.map_err(|_| Error::CantFindLocalAppDataFolder)?
.join("data")
.join("logs");
let log_path = log_path()?;
std::fs::create_dir_all(&log_path).map_err(Error::CreateDirAll)?;
let (layer, logger) = file_logger::layer(&log_path);
@@ -83,7 +80,7 @@ pub(crate) async fn count_logs() -> StdResult<FileCount, String> {
/// This includes the current log file, so we won't write any more logs to disk
/// until the file rolls over or the app restarts.
pub(crate) async fn clear_logs_inner(managed: &Managed) -> Result<()> {
let mut dir = tokio::fs::read_dir("logs").await?;
let mut dir = tokio::fs::read_dir(log_path()?).await?;
while let Some(entry) = dir.next_entry().await? {
tokio::fs::remove_file(entry.path()).await?;
}
@@ -132,7 +129,7 @@ pub(crate) async fn export_logs_to(path: PathBuf, stem: PathBuf) -> Result<()> {
let mut zip = zip::ZipWriter::new(f);
// All files will have the same modified time. Doing otherwise seems to be difficult
let options = zip::write::FileOptions::default();
for entry in fs::read_dir("logs")? {
for entry in fs::read_dir(log_path()?)? {
let entry = entry?;
let Some(path) = stem.join(entry.file_name()).to_str().map(|x| x.to_owned()) else {
bail!("log filename isn't valid Unicode")
@@ -152,7 +149,7 @@ pub(crate) async fn export_logs_to(path: PathBuf, stem: PathBuf) -> Result<()> {
/// Count log files and their sizes
pub(crate) async fn count_logs_inner() -> Result<FileCount> {
let mut dir = tokio::fs::read_dir("logs").await?;
let mut dir = tokio::fs::read_dir(log_path()?).await?;
let mut file_count = FileCount::default();
while let Some(entry) = dir.next_entry().await? {
@@ -163,3 +160,14 @@ pub(crate) async fn count_logs_inner() -> Result<FileCount> {
Ok(file_count)
}
/// Returns the well-known log path
///
/// e.g. %LOCALAPPDATA%/dev.firezone.client/data/logs/
pub(crate) fn log_path() -> Result<PathBuf, Error> {
let path = app_local_data_dir()
.map_err(|_| Error::CantFindLocalAppDataFolder)?
.join("data")
.join("logs");
Ok(path)
}