blink1control: api server logging control easier

todbot · Sep 9, 2015 · fd01d60 · fd01d60
1 parent 5475146
commit fd01d60
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/qt/blink1control/httpserver.cpp b/qt/blink1control/httpserver.cpp
@@ -169,11 +169,18 @@ void HttpServer::startRead(){
  resp.insert("status",QString("last color"));
  }
  else if( cmd=="/logging" ) {
- QString levelstr = qurlquery.queryItemValue("loglevel");
+ QString levelstr="";
+ if( qurlquery.hasQueryItem("loglevel") ) {
+ levelstr = qurlquery.queryItemValue("loglevel");
+ } else if( qurlquery.hasQueryItem("logLevel") ) {
+ levelstr = qurlquery.queryItemValue("logLevel");
+ }
  if( levelstr == "1" || levelstr == "0" ) {
  mw->startOrStopLogging(levelstr.toInt());
  }
- resp.insert("loglevel",mw->getLogging());
+
+ resp.insert("loglevel",(mw->getLogging()) ? 1 : 0);
+ resp.insert("logfile", mw->getLogFileName());
  resp.insert("status",QString("logging"));
  }
  else if( cmd=="/input" || cmd=="/inputs" ) {

diff --git a/qt/blink1control/mainwindow.cpp b/qt/blink1control/mainwindow.cpp
@@ -221,7 +221,7 @@ MainWindow::MainWindow(QWidget *parent) :
 void MainWindow::goingToSleep()
 {
  addToLog("goingToSleep...");
- sleepytime = true; 
+ sleepytime = true;
  on_buttonOff_clicked();
 }
 // call when we know we've been woken up