TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #50 from wojciechkepka/config

Browse source 
Use config_dir for logging, create config_dir
This commit is contained in:
Blaž Hrastnik 2021-06-02 22:43:28 +09:00 committed by GitHub
commit 0a6672c626
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
helix-term/src/main.rs
View file

@ -8,6 +8,8 @@ mod ui;
use application::Application;
use helix_core::config_dir;
use std::path::PathBuf;
use anyhow::{Context, Result};
@ -27,8 +29,6 @@ fn setup_logging(verbosity: u64) -> Result<()> {
_3_or_more => base_config.level(log::LevelFilter::Trace),
};
let home = dirs_next::home_dir().context("can't find the home directory")?;
// Separate file config so we can include year, month and day in file logs
let file_config = fern::Dispatch::new()
.format(|out, message, record| {
@ -40,7 +40,7 @@ fn setup_logging(verbosity: u64) -> Result<()> {
message
))
})
.chain(fern::log_file(home.join("helix.log"))?);
.chain(fern::log_file(config_dir().join("helix.log"))?);
base_config.chain(file_config).apply()?;
@ -89,6 +89,12 @@ FLAGS:
verbosity = 1;
}
let conf_dir = config_dir();
if !conf_dir.exists() {
std::fs::create_dir(&conf_dir);
}
setup_logging(verbosity).context("failed to initialize logging")?;
let args = Args {
@ -96,7 +102,6 @@ FLAGS:
};
// initialize language registry
use helix_core::config_dir;
use helix_core::syntax::{Loader, LOADER};
// load $HOME/.config/helix/languages.toml, fallback to default config