Skip to content

#1681 Respect logfile option #6379

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

Open
akleshchev wants to merge 3 commits into
base: develop
Choose a base branch
from
+15 −80
Open

#1681 Respect logfile option #6379

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f07127
Revert "#1681 Respect custom logfile during startup "
akleshchev Sep 26, 2026
8c971f2
#1681 Fix logfile option not applying
akleshchev Sep 25, 2026
12d2e3a
Add check for second instance before logging
akleshchev Sep 28, 2026
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
95 changes: 15 additions & 80 deletions indra/newview/llappviewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
#include "llconversationlog.h"
#if LL_WINDOWS
#include "lldxhardware.h"
#include <shellapi.h>
#endif
#include "lltexturestats.h"
#include "lltrace.h"
Expand Down Expand Up @@ -2362,12 +2361,6 @@ void errorHandler(const std::string& title_string, const std::string& message_st
}
}

namespace
{
std::string getStartupLogFileName();
std::string getOldLogFileName(const std::string& log_file);
}

void LLAppViewer::initLoggingAndGetLastDuration()
{
//
Expand Down Expand Up @@ -2399,10 +2392,13 @@ void LLAppViewer::initLoggingAndGetLastDuration()
else
{
// Remove the last ".old" log file.
std::string log_file = getStartupLogFileName();
std::string old_log_file = getOldLogFileName(log_file);
std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
"SecondLife.old");
LLFile::remove(old_log_file);

// Get name of the log file
std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
"SecondLife.log");
/*
* Before touching any log files, compute the duration of the last run
* by comparing the ctime of the previous start marker file with the ctime
Expand Down Expand Up @@ -2449,7 +2445,7 @@ void LLAppViewer::initLoggingAndGetLastDuration()
// Rename current log file to ".old"
LLFile::rename(log_file, old_log_file);

// Set the log file.
// Set the log file to SecondLife.log
LLError::logToFile(log_file);
LL_INFOS() << "Started logging to " << log_file << LL_ENDL;
if (!duration_log_msg.empty())
Expand Down Expand Up @@ -2588,76 +2584,6 @@ namespace
LLStringUtil::null,
OSMB_OK);
}

std::string getStartupLogFileName()
{
if (LLControlVariable* user_log_file = gSavedSettings.getControl("UserLogFile"))
{
std::string log_file = user_log_file->getValue().asString();
if (!log_file.empty())
{
return log_file;
}
}

#if LL_WINDOWS
int argc = 0;
LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
if (argv)
{
std::string log_file;
for (int i = 1; i < argc; ++i)
{
std::string option = ll_convert_wide_to_string(argv[i]);
if ((option == "--logfile" || option == "-logfile" || option == "/logfile") &&
i + 1 < argc)
{
log_file = ll_convert_wide_to_string(argv[i + 1]);
}
else if (option.compare(0, 10, "--logfile=") == 0)
{
log_file = option.substr(10);
}
else if (option.compare(0, 9, "-logfile=") == 0)
{
log_file = option.substr(9);
}
else if (option.compare(0, 9, "/logfile:") == 0)
{
log_file = option.substr(9);
}
}
LocalFree(argv);

if (!log_file.empty())
{
return log_file;
}
}
#endif

return gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLife.log");
}

std::string getOldLogFileName(const std::string& log_file)
{
std::string old_log_file = log_file;
size_t separator = old_log_file.find_last_of("/\\");
size_t basename_start = (separator == std::string::npos) ? 0 : separator + 1;
size_t extension = old_log_file.find_last_of('.');

if (extension != std::string::npos &&
extension > basename_start)
{
old_log_file.replace(extension, std::string::npos, ".old");
}
else
{
old_log_file += ".old";
}

return old_log_file;
}
} // anonymous namespace

// Set a named control temporarily for this session, as when set via the command line --set option.
Expand Down Expand Up @@ -3175,6 +3101,15 @@ bool LLAppViewer::initConfiguration()

loadColorSettings();

// Command line could have updated UserLogFile
std::string log_filename = gSavedSettings.getString("UserLogFile");
if (!mSecondInstance && !log_filename.empty() && LLError::logFileName() != log_filename)
{
LLFile::remove(log_filename);
LLError::logToFile(log_filename);
LL_INFOS("Settings") << "Logging switched to " << log_filename << LL_ENDL;
}

// Let anyone else who cares know that we've populated our settings
// variables.
for (const auto& key : LLControlGroup::key_snapshot())
Expand Down
Loading