roll back to 725 again

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ewensun 2008-09-17 13:18:12 +00:00
parent cc41cbb708
commit fa4727865c
7 changed files with 3 additions and 25 deletions

View File

@ -40,8 +40,6 @@
* #define FIM_DEBUG 1
***********/
#define FIM_DEBUG 1
FileIndexMonitor::FileIndexMonitor(CacheStrapper *cs, std::string cachedir, std::string pid)
:CacheSource(RS_SERVICE_TYPE_FILE_INDEX, false, cs, cachedir), fi(pid),
pendingDirs(false), pendingForceCacheWrite(false),
@ -187,8 +185,6 @@ void FileIndexMonitor::setPeriod(int period)
void FileIndexMonitor::run()
{
std::cerr << "FileIndexMonitor::run() ";
std::cerr << std::endl;
updateCycle();
@ -221,8 +217,6 @@ void FileIndexMonitor::run()
void FileIndexMonitor::updateCycle()
{
std::cerr << "FileIndexMonitor::updateCycle() ";
std::cerr << std::endl;
time_t startstamp = time(NULL);
/* iterate through all out-of-date directories */

View File

@ -37,8 +37,6 @@
* #define FI_DEBUG 1
****/
#define FI_DEBUG 1
DirEntry::~DirEntry()
{

View File

@ -44,9 +44,6 @@ FileIndexStore::~FileIndexStore()
* #define FIS_DEBUG 1
**/
#define FIS_DEBUG2 1
#define FIS_DEBUG 1
/* actual load, once data available */
int FileIndexStore::loadCache(const CacheData &data)
{

View File

@ -58,8 +58,6 @@ const int fldxsrvrzone = 47659;
#define SERVER_DEBUG 1
#define DEBUG_TICK 1
****/
#define SERVER_DEBUG 1
#define DEBUG_TICK 1
filedexserver::filedexserver()
:p3Config(CONFIG_TYPE_FSERVER),
@ -285,15 +283,9 @@ void filedexserver::setFileCallback(std::string ownId, CacheStrapper *strappe
void filedexserver::StartupMonitor()
{
std::cerr << "filedexserver::StartupMonitor() err" << std::endl;
pqioutput(PQL_DEBUG_BASIC, fldxsrvrzone,
"filedexserver::StartupMonitor()");
/* startup the FileMonitor (after cache load) */
fimon->setPeriod(100); /* 10 minutes */
fimon->setPeriod(600); /* 10 minutes */
/* start it up */
fimon->setSharedDirectories(dbase_dirs);
fimon->start();

View File

@ -30,7 +30,6 @@
* #define FT_DEBUG 1
***/
#define FT_DEBUG 1
bool ftManager::lookupLocalHash(std::string hash, std::string &path, uint64_t &size)
{

View File

@ -41,8 +41,6 @@ const int ftfilerzone = 86539;
* #define FT_DEBUG 1
***/
#define FT_DEBUG 1
/*
* PQI Filer
*

View File

@ -25,7 +25,7 @@
#include <gui/MainWindow.h>
#include <gui/StartDialog.h>
#include <gui/GenCertDialog.h>
//#include <Gui/Preferences/Rsharesettings.h>
#include <Gui/Preferences/Rsharesettings.h>
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
#include <gui/qskinobject/qskinobject.h>