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

Use the new singleton implementation for logging, if available. 

LOG_HAVE_SET_LOGGER and LOG_HAVE_DEVELOPER preprocessor symbols in
the new Log.h header file are checked to detect that.


git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@481 15ad00c4-1369-45f4-8270-35d70d36bdcd
This commit is contained in:
Patrick Ohly 2008-01-12 22:53:50 +00:00
parent 948defe248
commit acc239c090
2 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/EvolutionSyncClient.cpp
View File

@ -221,7 +221,10 @@ public:
FILE *file = fopen(m_logfile.c_str(), "w");
if (file) {
fclose(file);
setLogFile(m_logfile.c_str(), true);
#ifdef POSIX_LOG
POSIX_LOG.
#endif
setLogFile(NULL, m_logfile.c_str(), true);
} else {
LOG.error("creating log file %s failed", m_logfile.c_str());
}
@ -291,12 +294,18 @@ public:
if (all) {
if (m_logfile.size()) {
setLogFile("-", false);
#ifdef POSIX_LOG
POSIX_LOG.
#endif
setLogFile(NULL, "-", false);
}
LOG.setLevel(m_oldLogLevel);
} else {
if (m_logfile.size()) {
setLogFile(m_logfile.c_str(), false);
#ifdef POSIX_LOG
POSIX_LOG.
#endif
setLogFile(NULL, m_logfile.c_str(), false);
}
}
}
@ -468,8 +477,9 @@ public:
}
}
// scan for error messages
string logfile = m_logdir.getLogfile();
#ifndef LOG_HAVE_SET_LOGGER
// scan for error messages
if (!m_quiet && logfile.size()) {
ifstream in;
in.open(m_logdir.getLogfile().c_str());
@ -478,13 +488,14 @@ public:
getline(in, line);
if (line.find("[ERROR]") != line.npos) {
success = false;
cout << line << "\n";
cout << line << "\n";
} else if (line.find("[INFO]") != line.npos) {
cout << line << "\n";
}
}
in.close();
}
#endif
cout << flush;
cerr << flush;
@ -785,10 +796,15 @@ int EvolutionSyncClient::sync()
sourceList.setLogdir(logdir, atoi(maxlogdirs), atoi(loglevel));
// dump some summary information at the beginning of the log
LOG.debug("SyncML server account: %s", config.getAccessConfig().getUsername());
LOG.debug("client: SyncEvolution %s", VERSION);
#ifdef LOG_HAVE_DEVELOPER
# define LOG_DEVELOPER developer
#else
# define LOG_DEVELOPER debug
#endif
LOG.LOG_DEVELOPER("SyncML server account: %s", config.getAccessConfig().getUsername());
LOG.LOG_DEVELOPER("client: SyncEvolution %s", VERSION);
time_t now = time(NULL);
LOG.debug("current UTC date and time: %s", asctime(gmtime(&now)));
LOG.LOG_DEVELOPER("current UTC date and time: %s", asctime(gmtime(&now)));
initSources(sourceList, config, url);

37
src/syncevolution.cpp
View File

@ -111,6 +111,33 @@ void usage(char **argv, bool full, string error = string(""))
}
}
#ifdef LOG_HAVE_SET_LOGGER
class CmdLineLogger : public POSIXLog {
protected:
virtual void printLine(int firstLine,
const char *fullTime,
const char *shortTime,
LogLevel level,
const char *levelPrefix,
const char *line) {
POSIXLog::printLine(firstLine,
fullTime,
shortTime,
level,
levelPrefix,
line);
if (level <= LOG_LEVEL_INFO &&
getLogFile()) {
/* POSIXLog is printing to file, therefore print important lines to stdout */
fprintf(stdout, "%s [%s] %s\n",
shortTime,
levelPrefix,
line);
}
}
};
#endif
int main( int argc, char **argv )
{
#ifdef ENABLE_MAEMO
@ -131,7 +158,15 @@ int main( int argc, char **argv )
g_type_init();
#endif
setLogFile("-");
#ifdef LOG_HAVE_SET_LOGGER
static CmdLineLogger logger;
Log::setLogger(&logger);
#endif
#ifdef POSIX_LOG
POSIX_LOG.
#endif
setLogFile(NULL, "-");
LOG.reset();
LOG.setLevel(LOG_LEVEL_INFO);
resetError();