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.

Sign up for GitHub

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

Jump to bottom

helix-term: add config option for specifying log file #566

Closed
wants to merge 5 commits into from
Closed

helix-term: add config option for specifying log file #566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7a4608
helix-term: add config option for specifying log file
dsseng Aug 9, 2021
2ca9c3a
helix-term: show configured logfile in help
dsseng Aug 12, 2021
b75416a
restore default variable for readability
dsseng Aug 12, 2021
c9e733a
Merge branch 'master' into log-file-config
dsseng Aug 12, 2021
8591706
remove mistakenly added files
dsseng Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions helix-term/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ use serde::Deserialize;
use crate::keymap::Keymaps;

#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub struct Config {
pub theme: Option<String>,
pub log_file: Option<String>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call this log-path rather than log file. You can also use Option<PathBuf> here to parse straight into a PathBuf.

#[serde(default)]
pub lsp: LspConfig,
#[serde(default)]
Expand Down
20 changes: 13 additions & 7 deletions helix-term/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,8 @@ fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {

#[tokio::main]
async fn main() -> Result<()> {
let cache_dir = helix_core::cache_dir();
if !cache_dir.exists() {
std::fs::create_dir_all(&cache_dir).ok();
}
let log_path_default = helix_core::cache_dir().join("helix.log");

let logpath = cache_dir.join("helix.log");
let help = format!(
"\
{} {}
Expand All @@ -63,7 +59,7 @@ FLAGS:
env!("CARGO_PKG_VERSION"),
env!("CARGO_PKG_AUTHORS"),
env!("CARGO_PKG_DESCRIPTION"),
logpath.display(),
log_path_default.display(),
dsseng marked this conversation as resolved.
Show resolved Hide resolved
);

let args = Args::parse_args().context("could not parse arguments")?;
Expand All @@ -90,7 +86,17 @@ FLAGS:
Err(err) => return Err(Error::new(err)),
};

setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
let log_path = config
.log_file
.clone()
.map(PathBuf::from)
.unwrap_or(log_path_default);
let log_dir = log_path.parent().unwrap();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be .context("unable fetch parent path")?


if !log_dir.exists() {
std::fs::create_dir_all(log_dir).ok();
}
setup_logging(log_path, args.verbosity).context("failed to initialize logging")?;

// TODO: use the thread local executor to spawn the application task separately from the work pool
let mut app = Application::new(args, config).context("unable to create new application")?;
Expand Down