diff options
| author | Jonathan Bauer | 2012-10-12 12:46:08 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2012-10-12 12:46:08 +0200 |
| commit | 15d58128a87a4ae87842c685c07f895599103992 (patch) | |
| tree | f2a32901575a669cd2e856f9600715a03477e0a9 /src | |
| parent | README: log4cxx setup instructions (diff) | |
| download | fbgui-master.tar.gz fbgui-master.tar.xz fbgui-master.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/fbgui/fbgui.cpp | 2 | ||||
| -rw-r--r-- | src/fbgui/globals.h | 1 | ||||
| -rw-r--r-- | src/fbgui/main.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/fbgui/fbgui.cpp b/src/fbgui/fbgui.cpp index b4a92ca..9cb906d 100644 --- a/src/fbgui/fbgui.cpp +++ b/src/fbgui/fbgui.cpp @@ -140,7 +140,7 @@ void fbgui::loadURL() { } void fbgui::sslErrorHandler(QNetworkReply* rep, QList<QSslError> errList) { LOG4CXX_DEBUG(coreLogger, "Received SSL errors:"); - rep->ignoreSslErrors(errList); + //rep->ignoreSslErrors(errList); QList<QSslError>::iterator n; for (n = errList.begin(); n != errList.end(); ++n) { LOG4CXX_DEBUG(coreLogger, "Error :" << n->errorString()); diff --git a/src/fbgui/globals.h b/src/fbgui/globals.h index 353bda3..2cc2872 100644 --- a/src/fbgui/globals.h +++ b/src/fbgui/globals.h @@ -2,6 +2,7 @@ #define GLOBALS_H_ // fbgui default settings +#define VERSION "0.1.1" #define DEFAULT_URL "http://www.google.com" #define DEFAULT_DOWNLOAD_DIR "/tmp/fbgui" #define DEFAULT_CONFIG_PATH "/etc/fbgui.conf" diff --git a/src/fbgui/main.cpp b/src/fbgui/main.cpp index 09a1b45..4d04b9e 100644 --- a/src/fbgui/main.cpp +++ b/src/fbgui/main.cpp @@ -293,14 +293,16 @@ int main(int argc, char *argv[]) { // print config LOG4CXX_DEBUG(logger, "************* CONFIG INFO *************"); + LOG4CXX_DEBUG(logger, "Version: " << VERSION); LOG4CXX_DEBUG(logger, "configFilePath: " << configFilePath); LOG4CXX_DEBUG(logger, "logFilePath: " << logFilePath); + LOG4CXX_DEBUG(logger, "logConfigPath: " << loggingConfigFilePath); LOG4CXX_DEBUG(logger, "ipConfigFilePath: " << ipConfigFilePath); LOG4CXX_DEBUG(logger, "baseURL: " << baseURL.toString()); LOG4CXX_DEBUG(logger, "downloadDir : " << downloadPath); LOG4CXX_DEBUG(logger, "trigger: " << fileToTriggerURL); LOG4CXX_DEBUG(logger, "serialLocation: " << serialLocation); - LOG4CXX_DEBUG(logger, "ssl: " << sslSupport); + LOG4CXX_DEBUG(logger, "ssl: " << sslSupport); if (clOpts.contains("nd") || confFileSettings.contains("default/nd")) { LOG4CXX_DEBUG(logger, "*******************************************"); LOG4CXX_DEBUG(logger, "Network Discovery activated:"); |