summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-06-03 18:21:06 -0700
committerbrad kittenbrink <brad@lindenlab.com>2010-06-03 18:21:06 -0700
commit94a2a1a98bb22c88c87a6f1d3f5beb6bdc471d87 (patch)
tree50bc5b2cda61842145d65f0e1b37b13033a0ab15 /indra/newview
parent8990498b420ba7083aa35c3eb08d87ebcd2a29a4 (diff)
Backed out renaming of log files (changeset 7357f4ef70df)
executed: 'hg backout -r 7357f4ef70df --merge'
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp30
1 files changed, 2 insertions, 28 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a5343bb522..351c0cbae5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -81,7 +81,7 @@
#include "llvoicechannel.h"
#include "llvoavatarself.h"
#include "llsidetray.h"
-#include "lldate.h"
+
#include "llweb.h"
#include "llsecondlifeurls.h"
@@ -102,7 +102,6 @@
// Third party library includes
#include <boost/bind.hpp>
-#include <boost/regex.hpp>
#if LL_WINDOWS
@@ -1243,37 +1242,12 @@ bool LLAppViewer::cleanup()
// workaround for DEV-35406 crash on shutdown
LLEventPumps::instance().reset();
+ // remove any old breakpad minidump files from the log directory
if (! isError())
{
- // remove any old breakpad minidump files from the log directory
std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
logdir += gDirUtilp->getDirDelimiter();
gDirUtilp->deleteFilesInDir(logdir, "*-*-*-*-*.dmp");
-
- // remove any old log files saved from old crash reports.
- const static std::string mask = "*.*.log";
- std::string filename;
- while (gDirUtilp->getNextFileInDir(logdir, mask, filename, false))
- {
- static const boost::regex
- file_regex(".*\\.(.*)\\.log", boost::regex::extended);
- boost::smatch match;
- if(boost::regex_match(filename, match, file_regex) && match.size() > 1)
- {
- F64 date = LLDate(match[1]).secondsSinceEpoch();
- F64 age = LLDate::now().secondsSinceEpoch() - date;
- if( date > 0.0 && age > 604800.0 )
- {
- // Clean up files older than 1 week.
- llinfos << "removing old log file " << filename << llendl;
- LLFile::remove(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, filename));
- }
- }
- else
- {
- // ignore;
- }
- }
}
// *TODO - generalize this and move DSO wrangling to a helper class -brad