Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2015-12-28 18:21:56 +01:00
parent de1519f50b
commit 965971a86d
3 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
code/nel/src/misc/report.cpp
View file

@ -80,12 +80,8 @@ TReportResult report(const std::string &title, const std::string &subject, const
std::string reportPath;
if (!body.empty())
{
std::stringstream reportFile;
reportFile << getLogDirectory();
reportFile << "nel_report_";
reportFile << (int)time(NULL);
reportFile << ".log";
reportPath = CFile::findNewFile(reportFile.str());
std::string reportFile = getLogDirectory() + NLMISC::toString("nel_report_%u.log", (uint)time(NULL));
reportPath = CFile::findNewFile(reportFile);
std::ofstream f;
f.open(reportPath.c_str());
if (!f.good())
@ -108,36 +104,34 @@ TReportResult report(const std::string &title, const std::string &subject, const
|| CSystemUtils::detectWindowedApplication())
&& CFile::isExists(NL_CRASH_REPORT_TOOL))
{
std::stringstream params;
params << NL_CRASH_REPORT_TOOL;
std::string params;
params += NL_CRASH_REPORT_TOOL;
if (!reportPath.empty())
params << " -log \"" << reportPath << "\"";
params += NLMISC::toString(" -log \"%s\"", reportPath.c_str());
if (!subject.empty())
params << " -attachment \"" << attachment << "\"";
params += NLMISC::toString(" -attachment \"%s\"", attachment.c_str());
if (!title.empty())
params << " -title \"" << title << "\"";
params += NLMISC::toString(" -title \"%s\"", title.c_str());
if (!subject.empty())
params << " -subject \"" << subject << "\"";
params += NLMISC::toString(" -subject \"%s\"", subject.c_str());
const char *reportPostUrl = getReportPostURL();
if (reportPostUrl)
params << " -host \"" << reportPostUrl << "\"";
params += NLMISC::toString(" -host \"%s\"", reportPostUrl);
if (synchronous)
params << " -dev";
params += " -dev";
if (sendReport)
params << " -sendreport";
std::string paramsStr = params.str();
params += " -sendreport";
if (synchronous)
{
TReportResult result = (TReportResult)::system(paramsStr.c_str());
TReportResult result = (TReportResult)::system(params.c_str());
if (result != ReportAlwaysIgnore
&& result != ReportIgnore
&& result != ReportAbort
@ -153,7 +147,7 @@ TReportResult report(const std::string &title, const std::string &subject, const
}
else
{
NLMISC::launchProgram(NL_CRASH_REPORT_TOOL, paramsStr,
NLMISC::launchProgram(NL_CRASH_REPORT_TOOL, params,
NL_DEBUG_REPORT ? INelContext::isContextInitialised() : false); // Only log if required, avoid infinite loop
return defaultResult;
}

7
code/nel/tools/3d/zviewer/CMakeLists.txt
View file

@ -14,4 +14,9 @@ NL_ADD_RUNTIME_FLAGS(zviewer)
INSTALL(TARGETS zviewer RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
INSTALL(FILES zviewer.cfg DESTINATION ${NL_ETC_PREFIX} COMPONENT tools3d)
INSTALL(FILES readme.txt DESTINATION ${NL_SHARE_PREFIX}/zviewer COMPONENT tools3d)
IF(WITH_UNIX_STRUCTURE)
INSTALL(FILES readme.txt DESTINATION ${NL_SHARE_PREFIX}/zviewer COMPONENT tools3d)
ELSE()
INSTALL(FILES readme.txt DESTINATION ${NL_SHARE_PREFIX} COMPONENT tools3d RENAME zviewer.txt)
ENDIF()

6
code/ryzom/client/src/client.cpp
View file

@ -371,7 +371,8 @@ int main(int argc, char **argv)
DisableNLDebug = true;
#endif
createDebug();
// don't create log.log anymore because client.log is used
createDebug(NULL, false);
INelContext::getInstance().setWindowedApplication(true);
@ -544,6 +545,9 @@ int main(int argc, char **argv)
strcpy(filename, argv[0]);
// set process name for logs
CLog::setProcessName(filename);
// ignore signal SIGPIPE generated by libwww
signal(SIGPIPE, sigHandler);