Commit 3f664191 authored by Pavel Vainerman's avatar Pavel Vainerman

make style

parent 373b2172
...@@ -892,7 +892,7 @@ namespace uniset ...@@ -892,7 +892,7 @@ namespace uniset
<< ". Must be aref=[0..3]" << endl; << ". Must be aref=[0..3]" << endl;
return false; return false;
} }
inf->adelay = IOBase::initIntProp(it, "adelay", prop_prefix, false); inf->adelay = IOBase::initIntProp(it, "adelay", prop_prefix, false);
} }
......
...@@ -276,7 +276,7 @@ namespace uniset ...@@ -276,7 +276,7 @@ namespace uniset
3 - analog ref = other (undefined) 3 - analog ref = other (undefined)
*/ */
int aref; int aref;
int adelay; /*! Задержка на чтение аналоговых входов с мультиплексированием ( в мкс ) */ int adelay; /*! Задержка на чтение аналоговых входов с мультиплексированием ( в мкс ) */
/*! Измерительный диапазон /*! Измерительный диапазон
......
...@@ -90,7 +90,8 @@ LogDB::LogDB( const string& name, int argc, const char* const* argv, const strin ...@@ -90,7 +90,8 @@ LogDB::LogDB( const string& name, int argc, const char* const* argv, const strin
else else
{ {
// инициализируем сами, т.к. conf нету.. // инициализируем сами, т.к. conf нету..
const std::string loglevels = uniset::getArg2Param("--" + prefix + "log-add-levels", argc, argv, it.getProp("log"),""); const std::string loglevels = uniset::getArg2Param("--" + prefix + "log-add-levels", argc, argv, it.getProp("log"), "");
if( !loglevels.empty() ) if( !loglevels.empty() )
dblog->level(Debug::value(loglevels)); dblog->level(Debug::value(loglevels));
} }
......
...@@ -43,6 +43,7 @@ namespace uniset ...@@ -43,6 +43,7 @@ namespace uniset
resp.set("Access-Control-Allow-Methods", "GET"); resp.set("Access-Control-Allow-Methods", "GET");
resp.set("Access-Control-Allow-Request-Method", "*"); resp.set("Access-Control-Allow-Request-Method", "*");
resp.set("Access-Control-Allow-Origin", httpCORS_allow /* req.get("Origin") */); resp.set("Access-Control-Allow-Origin", httpCORS_allow /* req.get("Origin") */);
if( !registry ) if( !registry )
{ {
resp.setStatus(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR); resp.setStatus(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
......
...@@ -308,6 +308,7 @@ namespace uniset ...@@ -308,6 +308,7 @@ namespace uniset
if( res < 0 ) if( res < 0 )
{ {
int errnum = errno; int errnum = errno;
if( errnum != EAGAIN && dlog->is_warn() ) if( errnum != EAGAIN && dlog->is_warn() )
dlog->warn() << peername << "(getNextData): read from socket error(" << errnum << "): " << strerror(errnum) << endl; dlog->warn() << peername << "(getNextData): read from socket error(" << errnum << "): " << strerror(errnum) << endl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment