summaryrefslogtreecommitdiffstats
path: root/src/fbgui/fbgui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/fbgui/fbgui.cpp')
-rw-r--r--src/fbgui/fbgui.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/fbgui/fbgui.cpp b/src/fbgui/fbgui.cpp
index 9795821..e1676d1 100644
--- a/src/fbgui/fbgui.cpp
+++ b/src/fbgui/fbgui.cpp
@@ -163,11 +163,11 @@ void fbgui::watchForTrigger() {
} else {
// create it
if (file.open(QIODevice::WriteOnly)) {
- LOG4CXX_DEBUG(coreLogger, "[gui] Created: " << fileToTriggerURL);
+ LOG4CXX_DEBUG(coreLogger, "Created: " << fileToTriggerURL);
file.close();
} else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Creation of " << fileToTriggerURL << " failed!");
- LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
+ LOG4CXX_DEBUG(coreLogger, "Creation of " << fileToTriggerURL << " failed!");
+ LOG4CXX_DEBUG(coreLogger, "Exiting in 5 seconds...");
QTimer::singleShot(5000, this, SLOT(close()));
}
}
@@ -209,11 +209,11 @@ void fbgui::prepareURLLoad() {
bool fbgui::checkHost() const {
QHostInfo hostInfo = QHostInfo::fromName(baseURL.host());
if (hostInfo.error() != QHostInfo::NoError) {
- LOG4CXX_DEBUG(coreLogger, "[gui] Lookup of " << baseURL.host() << "failed.");
- LOG4CXX_DEBUG(coreLogger, "[gui] Host can not be reached.");
+ LOG4CXX_DEBUG(coreLogger, "Lookup of " << baseURL.host() << "failed.");
+ LOG4CXX_DEBUG(coreLogger, "Host can not be reached.");
return false;
} else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Lookup of " << baseURL.host() << " succeeded.");
+ LOG4CXX_DEBUG(coreLogger, "Lookup of " << baseURL.host() << " succeeded.");
return true;
}
}
@@ -230,7 +230,7 @@ bool fbgui::checkHost() const {
*/
void fbgui::loadURL() {
if (checkHost()) {
- LOG4CXX_DEBUG(coreLogger, "[gui] Loading URL: " << baseURL.toString() << " ...");
+ LOG4CXX_DEBUG(coreLogger, "Loading URL: " << baseURL.toString() << " ...");
// Generate POST identification data needed by PBS.
QByteArray postData = generatePOSTData();
@@ -246,11 +246,11 @@ void fbgui::loadURL() {
void fbgui::loadURLDone(bool success) {
// done contains the success of the loading: false / true
if (!success) {
- LOG4CXX_DEBUG(coreLogger, "[gui] Loading failed. URL: " << _webView->url().toString());
- LOG4CXX_DEBUG(coreLogger, "[gui] You can quit with CTRL + X ...");
+ LOG4CXX_DEBUG(coreLogger, "Loading failed. URL: " << _webView->url().toString());
+ LOG4CXX_DEBUG(coreLogger, "You can quit with CTRL + X ...");
// TODO handle failure properly...
} else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Loaded URL: " << _webView->url().toString());
+ LOG4CXX_DEBUG(coreLogger, "Loaded URL: " << _webView->url().toString());
}
}
//-------------------------------------------------------------------------------------------
@@ -269,7 +269,7 @@ void fbgui::loadURLDone(bool success) {
* @see SysInfo::getMainboardSerial()
*/
QByteArray fbgui::generatePOSTData() {
- LOG4CXX_DEBUG(coreLogger, "[gui] Generating POST data...");
+ LOG4CXX_DEBUG(coreLogger, "Generating POST data...");
// use MAC address as base data
SysInfo si;
QByteArray data(si.getInfo("mac").toUtf8());
@@ -278,7 +278,7 @@ QByteArray fbgui::generatePOSTData() {
if (!mbserial.isEmpty())
data.append(mbserial);
else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Mainboard serial was empty. Not appending to base hash data.");
+ LOG4CXX_DEBUG(coreLogger, "Mainboard serial was empty. Not appending to base hash data.");
}
LOG4CXX_DEBUG(coreLogger, "[post] Hashing: " << data);
// generate MD5 hash of data
@@ -330,7 +330,7 @@ void fbgui::performShutDown() {
file.write("o");
file.close();
} else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Could not open /proc/sysrq-trigger");
+ LOG4CXX_DEBUG(coreLogger, "Could not open /proc/sysrq-trigger");
}
}
//-------------------------------------------------------------------------------------------
@@ -353,7 +353,7 @@ void fbgui::performReboot() {
file.write("b");
file.close();
} else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Could not open /proc/sysrq-trigger");
+ LOG4CXX_DEBUG(coreLogger, "Could not open /proc/sysrq-trigger");
}
}
//-------------------------------------------------------------------------------------------
@@ -383,52 +383,52 @@ void fbgui::loadSystem() {
*/
void fbgui::prepareKexec() {
- LOG4CXX_DEBUG(coreLogger, "[gui] Preparing kexec ...");
+ LOG4CXX_DEBUG(coreLogger, "Preparing kexec ...");
// try to read KCL file that was downloaded.
QFile file(downloadPath + "/kcl");
if (!file.open(QIODevice::ReadOnly)) {
- LOG4CXX_DEBUG(coreLogger, "[gui] No such file: " << file.fileName());
+ LOG4CXX_DEBUG(coreLogger, "No such file: " << file.fileName());
}
// everything ok, read data.
QString kcl = file.readAll();
file.close();
- LOG4CXX_DEBUG(coreLogger, "[gui] KCL from PBS: " << kcl);
+ LOG4CXX_DEBUG(coreLogger, "KCL from PBS: " << kcl);
// try to read ipconfig file generated by udhcpc.
file.setFileName("/tmp/ip_config_fbgui");
if (!file.open(QIODevice::ReadOnly)) {
- LOG4CXX_DEBUG(coreLogger, "[gui] No such file: " << file.fileName());
+ LOG4CXX_DEBUG(coreLogger, "No such file: " << file.fileName());
}
// everything ok, read data.
QString ipConfig = file.readAll();
file.close();
- LOG4CXX_DEBUG(coreLogger, "[gui] IP config: " << ipConfig);
+ LOG4CXX_DEBUG(coreLogger, "IP config: " << ipConfig);
// append ipConfig
kcl.append(" ip=");
kcl.append(ipConfig);
- LOG4CXX_DEBUG(coreLogger, "[gui] Complete KCL: " << kcl);
+ LOG4CXX_DEBUG(coreLogger, "Complete KCL: " << kcl);
// load the kernel + initramfs + append of kcl into kexec.
QProcess *process = new QProcess(this);
QString cmdline = "kexec -l " + downloadPath.toUtf8() + "/kernel --initrd="
+ downloadPath.toUtf8() + "/initramfs --append=\"" + kcl.toUtf8()
+ "\"";
- LOG4CXX_DEBUG(coreLogger, "[gui] kexec cmdline: " << cmdline);
+ LOG4CXX_DEBUG(coreLogger, "kexec cmdline: " << cmdline);
process->start(cmdline);
bool ret = process->waitForFinished();
if (!ret) {
- LOG4CXX_DEBUG(coreLogger, "[gui] Failed to execute: " << cmdline);
- LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
+ LOG4CXX_DEBUG(coreLogger, "Failed to execute: " << cmdline);
+ LOG4CXX_DEBUG(coreLogger, "Exiting in 5 seconds...");
QTimer::singleShot(5000, this, SLOT(close()));
} else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Kexec load was successfull.");
+ LOG4CXX_DEBUG(coreLogger, "Kexec load was successfull.");
if (debugMode < 0) {
// if process successfully finished, try to run kexec -e
runKexec();
} else {
- LOG4CXX_DEBUG(coreLogger, "[gui] Skipping execution of kexec - open debug shell.");
- LOG4CXX_DEBUG(coreLogger, "[gui] To start the system execute \"kexec -e\" in your shell.");
+ LOG4CXX_DEBUG(coreLogger, "Skipping execution of kexec - open debug shell.");
+ LOG4CXX_DEBUG(coreLogger, "To start the system execute \"kexec -e\" in your shell.");
close();
}
}
@@ -444,8 +444,8 @@ void fbgui::runKexec() {
QProcess *process = new QProcess(this);
process->start("kexec -e");
if (!process->waitForStarted()) {
- LOG4CXX_DEBUG(coreLogger, "[gui] Failed to execute: kexec -e");
- LOG4CXX_DEBUG(coreLogger, "[gui] Exiting in 5 seconds...");
+ LOG4CXX_DEBUG(coreLogger, "Failed to execute: kexec -e");
+ LOG4CXX_DEBUG(coreLogger, "Exiting in 5 seconds...");
QTimer::singleShot(5000, this, SLOT(close()));
//TODO: Handle failure properly...
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-05-23 03:12:10 +0200