From 90436e100dcdbfcde22c5b568989a174092d35c9 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 29 Aug 2013 15:13:07 +0200 Subject: [PATCH] Updated controller to make use of new HTTP capabilities. --- src/controller/controller.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp index 6ac46d7f..fd8396c2 100644 --- a/src/controller/controller.cpp +++ b/src/controller/controller.cpp @@ -342,7 +342,7 @@ int main(int argc, char ** argv){ Converter::Converter myConverter; while (API_Socket.connected() && conf.is_active){ - usleep(10000); //sleep for 10 ms - prevents 100% CPU time + Util::sleep(10);//sleep for 10 ms - prevents 100% CPU time if (Util::epoch() - processchecker > 10){ processchecker = Util::epoch(); @@ -470,17 +470,7 @@ int main(int argc, char ** argv){ break; } if (it->C.spool() || it->C.Received().size()){ - if ( *(it->C.Received().get().rbegin()) != '\n'){ - std::string tmp = it->C.Received().get(); - it->C.Received().get().clear(); - if (it->C.Received().size()){ - it->C.Received().get().insert(0, tmp); - }else{ - it->C.Received().append(tmp); - } - continue; - } - if (it->H.Read(it->C.Received().get())){ + if (it->H.Read(it->C)){ Response.null(); //make sure no data leaks from previous requests if (it->clientMode){ // In clientMode, requests are reversed. These are connections we initiated to GearBox.