mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

log_init: call log_path_init (#11501)

Browse Source 
This has to be done after `init_homedir` for XDG default and `set_init_1` for
lookup from env, which could be done earlier likely (to help with
https://github.com/neovim/neovim/issues/10937), but this keeps it in
sync with Vim.

Fixes https://github.com/neovim/neovim/issues/11499.
This commit is contained in:
Daniel Hahler
2019-12-02 22:21:15 +01:00
committed by GitHub
parent 56be9fbde1
commit 22b52dd462
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/log.c
View File

@@ -93,6 +93,7 @@ static bool log_path_init(void)
void log_init(void) void log_init(void)
{ {
uv_mutex_init(&mutex); uv_mutex_init(&mutex);
log_path_init();
} }
void log_lock(void) void log_lock(void)

2
src/nvim/main.c
View File

@@ -144,7 +144,6 @@ static const char *err_extra_cmd =
void event_init(void) void event_init(void)
{ {
log_init();
loop_init(&main_loop, NULL); loop_init(&main_loop, NULL);
resize_events = multiqueue_new_child(main_loop.events); resize_events = multiqueue_new_child(main_loop.events);
@@ -220,6 +219,7 @@ void early_init(void)
// First find out the home directory, needed to expand "~" in options. // First find out the home directory, needed to expand "~" in options.
init_homedir(); // find real value of $HOME init_homedir(); // find real value of $HOME
set_init_1(); set_init_1();
log_init();
TIME_MSG("inits 1"); TIME_MSG("inits 1");
set_lang_var(); // set v:lang and v:ctype set_lang_var(); // set v:lang and v:ctype

9
test/functional/options/defaults_spec.lua
View File

@@ -224,9 +224,6 @@ describe('startup defaults', function()
XDG_DATA_HOME=xdgdir, XDG_DATA_HOME=xdgdir,
NVIM_LOG_FILE='', -- Empty is invalid. NVIM_LOG_FILE='', -- Empty is invalid.
}}) }})
-- server_start() calls ELOG, which tickles log_path_init().
pcall(command, 'call serverstart(serverlist()[0])')
eq(xdgdir..'/'..datasubdir..'/log', string.gsub(eval('$NVIM_LOG_FILE'), '\\', '/')) eq(xdgdir..'/'..datasubdir..'/log', string.gsub(eval('$NVIM_LOG_FILE'), '\\', '/'))
end) end)
it('defaults to stdpath("data")/log if invalid', function() it('defaults to stdpath("data")/log if invalid', function()
@@ -235,9 +232,6 @@ describe('startup defaults', function()
XDG_DATA_HOME=xdgdir, XDG_DATA_HOME=xdgdir,
NVIM_LOG_FILE='.', -- Any directory is invalid. NVIM_LOG_FILE='.', -- Any directory is invalid.
}}) }})
-- server_start() calls ELOG, which tickles log_path_init().
pcall(command, 'call serverstart(serverlist()[0])')
eq(xdgdir..'/'..datasubdir..'/log', string.gsub(eval('$NVIM_LOG_FILE'), '\\', '/')) eq(xdgdir..'/'..datasubdir..'/log', string.gsub(eval('$NVIM_LOG_FILE'), '\\', '/'))
end) end)
it('defaults to .nvimlog if stdpath("data") is invalid', function() it('defaults to .nvimlog if stdpath("data") is invalid', function()
@@ -245,9 +239,6 @@ describe('startup defaults', function()
XDG_DATA_HOME='Xtest-missing-xdg-dir', XDG_DATA_HOME='Xtest-missing-xdg-dir',
NVIM_LOG_FILE='.', -- Any directory is invalid. NVIM_LOG_FILE='.', -- Any directory is invalid.
}}) }})
-- server_start() calls ELOG, which tickles log_path_init().
pcall(command, 'call serverstart(serverlist()[0])')
eq('.nvimlog', eval('$NVIM_LOG_FILE')) eq('.nvimlog', eval('$NVIM_LOG_FILE'))
end) end)
end) end)