maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logging: allow detailed control over printing of database changes with --printChanges 

printChanges:
   enables or disables the detailed (and sometimes slow) comparison
   of database content before and after a sync session

This option can be overriden temporarily by classes derived from
EvolutionSyncClient in the prepare() call with setPrintChanges().
This commit is contained in:
Patrick Ohly 2009-04-21 11:22:32 +02:00
parent bc938ca34f
commit e9c5ed4653
4 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/core/EvolutionSyncClient.cpp
View File

@ -496,12 +496,20 @@ private:
// a logdir) handles writing of per-sync files as well
// as the final report (
class SourceList : public vector<EvolutionSyncSource *> {
public:
enum LogLevel {
LOGGING_QUIET, /**< avoid all extra output */
LOGGING_SUMMARY, /**< sync report, but no database comparison */
LOGGING_FULL /**< everything */
};
private:
LogDir m_logdir; /**< our logging directory */
bool m_prepared; /**< remember whether syncPrepare() dumped databases successfully */
bool m_doLogging; /**< true iff the normal logdir handling is enabled
(creating and expiring directoties, before/after comparison) */
bool m_reportTodo; /**< true if syncDone() shall print a final report */
const bool m_quiet; /**< avoid redundant printing to screen */
LogLevel m_logLevel; /**< chooses how much information is printed */
string m_previousLogdir; /**< remember previous log dir before creating the new one */
/** create name in current (if set) or previous logdir */
@ -515,6 +523,9 @@ class SourceList : public vector<EvolutionSyncSource *> {
}
public:
LogLevel getLogLevel() const { return m_logLevel; }
void setLogLevel(LogLevel logLevel) { m_logLevel = logLevel; }
/**
* dump into files with a certain suffix
*/
@ -547,12 +558,12 @@ public:
}
}
SourceList(const string &server, bool doLogging, bool quiet) :
SourceList(const string &server, bool doLogging) :
m_logdir(server),
m_prepared(false),
m_doLogging(doLogging),
m_reportTodo(true),
m_quiet(quiet)
m_logLevel(LOGGING_FULL)
{
}
@ -582,7 +593,7 @@ public:
void setPath(const string &path) { m_logdir.setPath(path); }
/**
* If possible (m_previousLogdir found) and enabled (!m_quiet),
* If possible (m_previousLogdir found) and enabled,
* then dump changes applied locally.
*
* @param oldSuffix suffix of old database dump: usually "after"
@ -590,7 +601,7 @@ public:
* when not doing a sync, otherwise "before"
*/
bool dumpLocalChanges(const string &oldSuffix, const string &newSuffix) {
if (m_quiet || !m_previousLogdir.size()) {
if (m_logLevel <= LOGGING_SUMMARY || !m_previousLogdir.size()) {
return false;
}
@ -669,15 +680,15 @@ public:
}
// pretty-print report
if (!m_quiet) {
if (m_logLevel > LOGGING_QUIET) {
cout << "\nChanges applied during synchronization:\n";
}
if (!m_quiet && report) {
if (m_logLevel > LOGGING_QUIET && report) {
cout << *report;
}
// compare databases?
if (!m_quiet && m_prepared) {
if (m_logLevel > LOGGING_SUMMARY && m_prepared) {
cout << "\nChanges applied to client during synchronization:\n";
BOOST_FOREACH(EvolutionSyncSource *source, *this) {
cout << "*** " << source->getName() << " ***\n" << flush;
@ -1326,7 +1337,10 @@ SyncMLStatus EvolutionSyncClient::sync(SyncReport *report)
}
// redirect logging as soon as possible
SourceList sourceList(m_server, m_doLogging, m_quiet);
SourceList sourceList(m_server, m_doLogging);
sourceList.setLogLevel(m_quiet ? SourceList::LOGGING_QUIET :
getPrintChanges() ? SourceList::LOGGING_FULL :
SourceList::LOGGING_SUMMARY);
m_sourceListPtr = &sourceList;
try {
@ -1740,7 +1754,7 @@ void EvolutionSyncClient::status()
throwError("cannot proceed without configuration");
}
SourceList sourceList(m_server, false, false);
SourceList sourceList(m_server, false);
initSources(sourceList);
BOOST_FOREACH(EvolutionSyncSource *source, sourceList) {
source->checkPassword(*this);

3
src/core/SyncEvolutionCmdline.cpp
View File

@ -912,6 +912,7 @@ public:
"config.ini:password = your SyncML server password\n"
"config.ini:# logdir = \n"
"config.ini:# loglevel = 0\n"
"config.ini:# printChanges = 1\n"
"config.ini:# maxlogdirs = 10\n"
"config.ini:# useProxy = 0\n"
"config.ini:# proxyHost = \n"
@ -1308,6 +1309,8 @@ protected:
"\n"
"loglevel:\n"
"\n"
"printChanges:\n"
"\n"
"maxlogdirs:\n"
"\n"
"useProxy:\n"

7
src/core/SyncEvolutionConfig.cpp
View File

@ -417,6 +417,10 @@ static IntConfigProperty syncPropLogLevel("loglevel",
"- 1 = only ERROR messages\n"
"- 2 = also INFO messages\n"
"- 3 = also DEBUG messages");
static BoolConfigProperty syncPropPrintChanges("printChanges",
"enables or disables the detailed (and sometimes slow) comparison\n"
"of database content before and after a sync session",
"1");
static ConfigProperty syncPropSSLServerCertificates("SSLServerCertificates",
"A string specifying the location of the certificates\n"
"used to authenticate the server. When empty, the\n"
@ -459,6 +463,7 @@ ConfigPropertyRegistry &EvolutionSyncConfig::getRegistry()
syncPropPassword.setObligatory(true);
registry.push_back(&syncPropLogDir);
registry.push_back(&syncPropLogLevel);
registry.push_back(&syncPropPrintChanges);
registry.push_back(&syncPropMaxLogDirs);
registry.push_back(&syncPropUseProxy);
registry.push_back(&syncPropProxyHost);
@ -569,6 +574,8 @@ int EvolutionSyncConfig::getMaxLogDirs() const { return syncPropMaxLogDirs.getPr
void EvolutionSyncConfig::setMaxLogDirs(int value, bool temporarily) { syncPropMaxLogDirs.setProperty(*m_configNode, value, temporarily); }
int EvolutionSyncConfig::getLogLevel() const { return syncPropLogLevel.getProperty(*m_configNode); }
void EvolutionSyncConfig::setLogLevel(int value, bool temporarily) { syncPropLogLevel.setProperty(*m_configNode, value, temporarily); }
bool EvolutionSyncConfig::getPrintChanges() const { return syncPropPrintChanges.getProperty(*m_configNode); }
void EvolutionSyncConfig::setPrintChanges(bool value, bool temporarily) { syncPropPrintChanges.setProperty(*m_configNode, value, temporarily); }
std::string EvolutionSyncConfig::getWebURL() const { return syncPropWebURL.getProperty(*m_configNode); }
void EvolutionSyncConfig::setWebURL(const std::string &url, bool temporarily) { syncPropWebURL.setProperty(*m_configNode, url, temporarily); }
std::string EvolutionSyncConfig::getIconURI() const { return syncPropIconURI.getProperty(*m_configNode); }

3
src/core/SyncEvolutionConfig.h
View File

@ -633,6 +633,9 @@ class EvolutionSyncConfig {
virtual int getLogLevel() const;
virtual void setLogLevel(int value, bool temporarily = false);
virtual bool getPrintChanges() const;
virtual void setPrintChanges(bool value, bool temporarily = false);
virtual std::string getWebURL() const;
virtual void setWebURL(const std::string &url, bool temporarily = false);