Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-28 18:41:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add -log-file=stderr and make it default

Browse Source 
Change -log-file-append to a boolean flag
This commit is contained in:
Fangrui Song 2019-01-21 10:20:07 +08:00
parent c592f95be0
commit f496580081
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/log.cc
View File

@ -60,6 +60,7 @@ Message::~Message() {
std::lock_guard<std::mutex> lock(mtx); std::lock_guard<std::mutex> lock(mtx);
stream_ << '\n'; stream_ << '\n';
fputs(stream_.str().c_str(), file); fputs(stream_.str().c_str(), file);
fflush(file);
if (verbosity_ == Verbosity_FATAL) if (verbosity_ == Verbosity_FATAL)
abort(); abort();
} }

19
src/main.cc
View File

@ -46,10 +46,10 @@ opt<std::string> opt_index("index",
value_desc("root"), cat(C)); value_desc("root"), cat(C));
list<std::string> opt_init("init", desc("extra initialization options in JSON"), list<std::string> opt_init("init", desc("extra initialization options in JSON"),
cat(C)); cat(C));
opt<std::string> opt_log_file("log-file", desc("log"), value_desc("filename"), opt<std::string> opt_log_file("log-file", desc("stderr or log file"),
value_desc("file"), init("stderr"), cat(C));
opt<bool> opt_log_file_append("log-file-append", desc("append to log file"),
cat(C)); cat(C));
opt<std::string> opt_log_file_append("log-file-append", desc("log"),
value_desc("filename"), cat(C));
void CloseLog() { fclose(ccls::log::file); } void CloseLog() { fclose(ccls::log::file); }
@ -83,14 +83,13 @@ int main(int argc, char **argv) {
bool language_server = true; bool language_server = true;
if (opt_log_file.size() || opt_log_file_append.size()) { if (opt_log_file.size()) {
ccls::log::file = opt_log_file.size() ccls::log::file =
? fopen(opt_log_file.c_str(), "wb") opt_log_file == "stderr"
: fopen(opt_log_file_append.c_str(), "ab"); ? stderr
: fopen(opt_log_file.c_str(), opt_log_file_append ? "ab" : "wb");
if (!ccls::log::file) { if (!ccls::log::file) {
fprintf( fprintf(stderr, "failed to open %s\n", opt_log_file.c_str());
stderr, "failed to open %s\n",
(opt_log_file.size() ? opt_log_file : opt_log_file_append).c_str());
return 2; return 2;
} }
setbuf(ccls::log::file, NULL); setbuf(ccls::log::file, NULL);