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

A little cleanup of CMsgBoxDisplayer.

Browse source
This commit is contained in:
dfighter1985 2015-02-21 22:32:11 +01:00
parent b8192c387f
commit 169a41c59d
4 changed files with 7 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/nel/include/nel/misc/report.h
View file

@ -21,21 +21,8 @@
namespace NLMISC {
/** Display a custom message box.
*
* \param title set the title of the report. If empty, it'll display "NeL report".
* \param header message displayed before the edit text box. If empty, it displays the default message.
* \param body message displayed in the edit text box. This string will be sent by email.
* \param debugButton 0 for disabling it, 1 for enable with default behaviors (generate a breakpoint), 2 for enable with no behavior
*
*
*
* \return the button clicked or error
*/
enum TReportResult { ReportDebug, ReportIgnore, ReportQuit, ReportError };
TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const std::string &attachedFile = "");
/// Prepares the error report, writes it to disk and launches the error reporter
void report ( const std::string &body );
/** call this in the main of your appli to enable email: setReportEmailFunction (sendEmail);
*/

2
code/nel/src/misc/debug.cpp
View file

@ -553,7 +553,7 @@ public:
// yoyo: allow only to send the crash report once. Because users usually click ignore,
// which create noise into list of bugs (once a player crash, it will surely continues to do it).
bool i = false;
report (progname+shortExc, "", subject, _Reason, true, 1, true, 1, !isCrashAlreadyReported(), i, NL_CRASH_DUMP_FILE);
report ( _Reason );
// no more sent mail for crash
setCrashAlreadyReported(true);

174
code/nel/src/misc/displayer.cpp
View file

@ -529,114 +529,7 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes
// in release "<Msg>"
void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message)
{
bool needSpace = false;
// stringstream ss;
string str;
// create the string for the clipboard
if (args.Date != 0)
{
str += dateToHumanString(args.Date);
needSpace = true;
}
if (args.LogType != CLog::LOG_NO)
{
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; }
str += logTypeToString(args.LogType);
needSpace = true;
}
if (!args.ProcessName.empty())
{
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; }
str += args.ProcessName;
needSpace = true;
}
if (args.FileName != NULL)
{
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; }
str += CFile::getFilename(args.FileName);
needSpace = true;
}
if (args.Line != -1)
{
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; }
str += NLMISC::toString(args.Line);
needSpace = true;
}
if (args.FuncName != NULL)
{
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; }
str += args.FuncName;
needSpace = true;
}
if (needSpace) { str += ": "; needSpace = false; }
str += message;
CSystemUtils::copyTextToClipboard(str);
// create the string on the screen
needSpace = false;
// stringstream ss2;
string str2;
#ifdef NL_DEBUG
if (!args.ProcessName.empty())
{
if (needSpace) { str2 += " "; needSpace = false; }
str2 += args.ProcessName;
needSpace = true;
}
if (args.FileName != NULL)
{
if (needSpace) { str2 += " "; needSpace = false; }
str2 += CFile::getFilename(args.FileName);
needSpace = true;
}
if (args.Line != -1)
{
if (needSpace) { str2 += " "; needSpace = false; }
str2 += NLMISC::toString(args.Line);
needSpace = true;
}
if (args.FuncName != NULL)
{
if (needSpace) { str2 += " "; needSpace = false; }
str2 += args.FuncName;
needSpace = true;
}
if (needSpace) { str2 += ": "; needSpace = false; }
#endif // NL_DEBUG
str2 += message;
str2 += "\n\n(this message was copied in the clipboard)";
/* if (IsDebuggerPresent ())
{
// Must break in assert call
DebugNeedAssert = true;
}
else
*/ {
// Display the report
string body;
@ -656,69 +549,8 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
body += "Reason: " + toString(message);
body += args.CallstackAndLog;
string subject;
// procname is host/service_name-sid we only want the service_name to avoid redondant mail
string procname;
string::size_type pos = args.ProcessName.find ("/");
if (pos == string::npos)
{
procname = args.ProcessName;
}
else
{
string::size_type pos2 = args.ProcessName.find ("-", pos+1);
if (pos2 == string::npos)
{
procname = args.ProcessName.substr (pos+1);
}
else
{
procname = args.ProcessName.substr (pos+1, pos2-pos-1);
}
}
subject += procname + " NeL " + toString(LogTypeToString[0][args.LogType]) + " " + (args.FileName?string(args.FileName):"") + " " + toString(args.Line) + " " + (args.FuncName?string(args.FuncName):"");
// Check the envvar NEL_IGNORE_ASSERT
if (getenv ("NEL_IGNORE_ASSERT") == NULL)
{
// yoyo: allow only to send the crash report once. Because users usually click ignore,
// which create noise into list of bugs (once a player crash, it will surely continues to do it).
std::string filename = getLogDirectory() + NL_CRASH_DUMP_FILE;
if (ReportDebug == report (args.ProcessName + " NeL " + toString(logTypeToString(args.LogType, true)), "", subject, body, true, 2, true, 1, !isCrashAlreadyReported(), IgnoreNextTime, filename.c_str()))
{
INelContext::getInstance().setDebugNeedAssert(true);
}
// no more sent mail for crash
setCrashAlreadyReported(true);
}
/* // Check the envvar NEL_IGNORE_ASSERT
if (getenv ("NEL_IGNORE_ASSERT") == NULL)
{
// Ask the user to continue, debug or ignore
int result = MessageBox (NULL, ss2.str().c_str (), logTypeToString(args.LogType, true), MB_ABORTRETRYIGNORE | MB_ICONSTOP);
if (result == IDABORT)
{
// Exit the program now
exit (EXIT_FAILURE);
}
else if (result == IDRETRY)
{
// Give the debugger a try
DebugNeedAssert = true;
}
else if (result == IDIGNORE)
{
// Continue, do nothing
}
}
*/ }
report( body );
}

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

@ -22,23 +22,8 @@
#include "nel/misc/report.h"
#include "nel/misc/path.h"
#ifdef NL_OS_WINDOWS
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
# include <windowsx.h>
# include <winuser.h>
#endif // NL_OS_WINDOWS
#define NL_NO_DEBUG_FILES 1
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NLMISC
{
@ -52,7 +37,7 @@ void setReportEmailFunction (void *emailFunction)
EmailFunction = (TEmailFunction)emailFunction;
}
TReportResult report (const std::string &title, const std::string &header, const std::string &subject, const std::string &body, bool enableCheckIgnore, uint debugButton, bool ignoreButton, sint quitButton, bool sendReportButton, bool &ignoreNextTime, const string &attachedFile)
void report ( const std::string &body )
{
std::string fname = "rcerrorlog.txt";
@ -78,8 +63,6 @@ TReportResult report (const std::string &title, const std::string &header, const
#endif
// quit without calling atexit or static object dtors.
abort();
return ReportQuit;
}