summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJonathan Bauer2011-04-24 17:42:03 +0200
committerJonathan Bauer2011-04-24 17:42:03 +0200
commita7fb2734a2e1e29a63fa60beae00b3a2496c8e5b (patch)
treeb2dfbb79fb1a2e4e4349077a8197b817ebbc1ee8 /src/main.cpp
parentnew logger engine to output in file, configurable per cmdline / config file (diff)
downloadfbgui-a7fb2734a2e1e29a63fa60beae00b3a2496c8e5b.tar.gz
fbgui-a7fb2734a2e1e29a63fa60beae00b3a2496c8e5b.tar.xz
fbgui-a7fb2734a2e1e29a63fa60beae00b3a2496c8e5b.zip
log file config fix
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 24e0430..d51bc02 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,13 +49,13 @@ int main(int argc, char *argv[]) {
// parse command line arguments using getopt
QMap<QString, QString> clOpts;
int longIndex = 0;
- static const char *optString = "c:u:d:s:t:D:h";
+ static const char *optString = "c:u:d:s:t:D:hl:";
static const struct option longOpts[] = { { "config", required_argument,
NULL, 'c' }, { "url", required_argument, NULL, 'u' }, { "download",
required_argument, NULL, 'd' }, { "serial", required_argument, NULL,
's' }, { "trigger", required_argument, NULL, 't' }, { "debug",
required_argument, NULL, 'D' }, { "help", no_argument, NULL, 'h' }, {
- "logfile", required_argument, NULL, 'l' } };
+ "log", required_argument, NULL, 'l' } };
int opt = getopt_long(argc, argv, optString, longOpts, &longIndex);
while (opt != -1) {
switch (opt) {
@@ -144,6 +144,7 @@ int main(int argc, char *argv[]) {
else
downloadPath = DEFAULT_DOWNLOAD_DIR;
+ // set update interval for download progress functions of download manager.
if (confFileSettings.contains("default/update_interval"))
updateInterval
= confFileSettings.value("default/update_interval").toInt();
@@ -173,8 +174,8 @@ int main(int argc, char *argv[]) {
ipConfigFilePath = confFileSettings.value("default/ip_config").toString();
// save path to log file
- if (clOpts.contains("logFile"))
- logFilePath = clOpts.value("logFile");
+ if (clOpts.contains("logFile")){
+ logFilePath = clOpts.value("logFile");qxtLog->debug() << "LOG FILE: " << clOpts.value("logFile");}
else if (confFileSettings.contains("default/log_file"))
logFilePath = confFileSettings.value("default/log_file").toString();
else