timestamps for debug console

5 files changed, 38 insertions, 19 deletions

diff --git a/fbgui.conf b/fbgui.conf
index e93b471..168c1ac 100644
--- a/fbgui.conf
+++ b/fbgui.conf
@@ -3,3 +3,4 @@ pbs_url=http://132.230.4.27
 download_directory=/tmp/fbgui
 update_interval=5
 file_trigger=/tmp/fbgui/trigger
+serial_location=/serial
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index cddee26..df0919b 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -9,6 +9,7 @@
 #include <QtWebKit>
 #include <QxtCore>
 
+QString serialLocation("");
 QString fileToTriggerURL("");
 QString sessionID("");
 QUrl baseURL("");
@@ -22,9 +23,9 @@ fbgui::fbgui()
 {
 
 	// test for libsys function
-	SysInfoLibsysfs* sil = new SysInfoLibsysfs();
-	sil->getInfoAboutNetworkInterface();
-	sil->getInfoAboutClassNet();
+	//SysInfoLibsysfs* sil = new SysInfoLibsysfs();
+	//sil->getInfoAboutNetworkInterface();
+	//sil->getInfoAboutClassNet();
 
 	// start basic console debug log
 	qxtLog->disableLoggerEngine("DEFAULT");
@@ -156,9 +157,8 @@ void fbgui::loadURL(){
 
 	// serial number
 	QByteArray serial;
-	// fetch serial number from rootfs
-	// try to open, TODO configurable path
-	QFile file("/serial");
+	// fetch serial number from usb rootfs
+	QFile file(serialLocation);
 	if (!file.exists()){
 		qxtLog->debug() << "No such file: " << file.fileName();
 		serial = "10-23-43-55-67"; // tests
@@ -177,10 +177,12 @@ void fbgui::loadURL(){
 	serial.chop(1);
 	qxtLog->debug() << "Serial number is: " <<  serial;
 
+	postData.append(serial);
 
 	// load if host is valid
 	if (checkHost()){
 		qxtLog->debug() << "Loading URL...";
+		qxtLog->debug() << "POST data: " << postData;
 		_webView->load(req, QNetworkAccessManager::PostOperation, postData);
 	}
 }
diff --git a/src/fbgui.h b/src/fbgui.h
index 6df76b8..a870dba 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -11,7 +11,7 @@
 # General information about OpenSLX can be found under http://openslx.org
 #
 #
-# 	   Main class for the fbgui.
+# 	   Main class of the fbgui.
 #
 */
 
@@ -33,6 +33,7 @@
 
 
 // Global settings
+extern QString serialLocation;
 extern QString fileToTriggerURL;
 extern QString sessionID;
 extern QString binPath;
diff --git a/src/loggerengine.cpp b/src/loggerengine.cpp
index e6bf402..6be143a 100644
--- a/src/loggerengine.cpp
+++ b/src/loggerengine.cpp
@@ -33,6 +33,9 @@ bool LoggerEngine_fb::isInitialized() const{
 void LoggerEngine_fb::writeFormatted(QxtLogger::LogLevel level, const QList<QVariant> & msgs){
 	// TODO: handle different log levels
 	if (msgs.isEmpty()) return;
+	QString header = '[' + QTime::currentTime().toString("hh:mm:ss.zzz") + "] ";
+	_debugConsole->insertPlainText(header);
+	// only write to console for debug level
 	if (level == QxtLogger::DebugLevel){
 		Q_FOREACH(const QVariant& out, msgs){
 			if (!out.isNull())
diff --git a/src/main.cpp b/src/main.cpp
index 9e92361..0e3ce53 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,7 +14,7 @@ void printHelp()
     qout << "-u <URL>, --url=<URL>           " << QObject::tr("Set which URL to load.") << endl;
     qout << "-d <dir>, --download=<dir>      " << QObject::tr("Specify the download directory.") << endl;
     qout << "-c <path>, --config=<path>      " << QObject::tr("Path to config file.") << endl;
-    qout << "-D, --debug                     " << QObject::tr("Activate debug mode.") << endl;
+    qout << "-D <level>, --debug=<level>     " << QObject::tr("Activate debug mode.") << endl;
     qout << "-h, --help                      " << QObject::tr("Prints usage information.") << endl;
     qout.flush();
     exit(EXIT_SUCCESS);
@@ -34,12 +34,13 @@ int main(int argc, char *argv[])
     // parse command line arguments
     QMap<QString, QString> clOpts;
     int longIndex = 0;
-    static const char *optString = "u:d:c:t:D:h";
+    static const char *optString = "c:u:d:s:t:D:h";
     static const struct option longOpts[] =
     {
+    	{"config", required_argument, NULL, 'c'},
     	{"url", required_argument, NULL, 'u'},
     	{"download", required_argument, NULL, 'd'},
-    	{"config", required_argument, NULL, 'c'},
+    	{"serial", required_argument, NULL, 's'},
     	{"trigger", required_argument, NULL, 't'},
     	{"debug", required_argument, NULL, 'D'},
     	{"help", no_argument, NULL, 'h'}
@@ -110,14 +111,6 @@ int main(int argc, char *argv[])
     else {
     	baseURL = DEFAULT_URL;
     }
-	
-    // sets which file to watch to trigger loading of URL
-    if (clOpts.contains("trigger"))
-    	fileToTriggerURL = clOpts.value("trigger");
-    else if (confFileSettings.contains("default/file_trigger"))
-    	fileToTriggerURL = confFileSettings.value("default/file_trigger").toString();
-    else
-    	fileToTriggerURL = DEFAULT_FILE_TRIGGER;
 
     // setting directory for downloads
     if (clOpts.contains("downloadDir")){
@@ -134,12 +127,31 @@ int main(int argc, char *argv[])
 	}
 	else updateInterval = DEFAULT_UPDATE_INTERVAL;
 
+    // sets which file to watch to trigger loading of URL
+    if (clOpts.contains("trigger"))
+    	fileToTriggerURL = clOpts.value("trigger");
+    else if (confFileSettings.contains("default/file_trigger"))
+    	fileToTriggerURL = confFileSettings.value("default/file_trigger").toString();
+    else
+    	fileToTriggerURL = DEFAULT_FILE_TRIGGER;
+
+	// set serial location
+	if (clOpts.contains("serial"))
+		serialLocation = clOpts.value("serial");
+	else if (confFileSettings.contains("default/serial_location"))
+		serialLocation = confFileSettings.value("default/serial_location").toString();
+	else
+		serialLocation = QString("/serial");
+
 	// basic std out engine is ugly... not yet initialised so using qDebug
-	qDebug() << "debugMode: " << debugMode;
+
+	qDebug() << "*************   CONFIG INFO   *************";
 	qDebug() << "configFilePath: " << configFilePath;
 	qDebug() << "baseURL: " << baseURL;
 	qDebug() << "downloadDir : " << downloadPath;
 	qDebug() << "trigger: " << fileToTriggerURL;
+	qDebug() << "serialLocation: " << serialLocation;
+	qDebug() << "*******************************************";
 
 	// start fbgui
     fbgui gui;