Commit 6d29b45a authored by Pavel Vainerman's avatar Pavel Vainerman

(codegen): Мелкие правки

parent a6485982
...@@ -608,9 +608,10 @@ nlohmann::json <xsl:value-of select="$CLASSNAME"/>_SK::httpGet( const Poco::URI: ...@@ -608,9 +608,10 @@ nlohmann::json <xsl:value-of select="$CLASSNAME"/>_SK::httpGet( const Poco::URI:
auto&amp; jsens = jstat["sensors"]; auto&amp; jsens = jstat["sensors"];
for( const auto&amp; s: smStat ) for( const auto&amp; s: smStat )
{ {
auto&amp; js = jsens[str(s.first,false)]; std::string sname(ORepHelpers::getShortName( uniset_conf()->oind->getMapName(s.first)));
auto&amp; js = jsens[sname];
js["id"] = s.first; js["id"] = s.first;
js["name"] = ORepHelpers::getShortName( uniset_conf()->oind->getMapName(s.first) ); js["name"] = sname;
js["count"] = s.second; js["count"] = s.second;
} }
</xsl:if> </xsl:if>
......
...@@ -508,19 +508,22 @@ void IONotifyController::send( ConsumerListInfo& lst, const UniSetTypes::SensorM ...@@ -508,19 +508,22 @@ void IONotifyController::send( ConsumerListInfo& lst, const UniSetTypes::SensorM
} }
catch( const CORBA::SystemException& ex ) catch( const CORBA::SystemException& ex )
{ {
uwarn << myname << "(IONotifyController::send): attempt=" << li->attempt << " " uwarn << myname << "(IONotifyController::send): attempt=" << (maxAttemtps - li->attempt + 1)
<< " from " << maxAttemtps << " "
<< uniset_conf()->oind->getNameById(li->id) << "@" << li->node << " (CORBA::SystemException): " << uniset_conf()->oind->getNameById(li->id) << "@" << li->node << " (CORBA::SystemException): "
<< ex.NP_minorString() << endl; << ex.NP_minorString() << endl;
} }
catch( const std::exception& ex ) catch( const std::exception& ex )
{ {
uwarn << myname << "(IONotifyController::send): attempt=" << li->attempt << " " uwarn << myname << "(IONotifyController::send): attempt=" << (maxAttemtps - li->attempt + 1) << " "
<< " from " << maxAttemtps << " "
<< ex.what() << ex.what()
<< " for " << uniset_conf()->oind->getNameById(li->id) << "@" << li->node << endl; << " for " << uniset_conf()->oind->getNameById(li->id) << "@" << li->node << endl;
} }
catch(...) catch(...)
{ {
ucrit << myname << "(IONotifyController::send): attempt=" << li->attempt << " " ucrit << myname << "(IONotifyController::send): attempt=" << (maxAttemtps - li->attempt + 1) << " "
<< " from " << maxAttemtps << " "
<< uniset_conf()->oind->getNameById(li->id) << "@" << li->node << uniset_conf()->oind->getNameById(li->id) << "@" << li->node
<< " catch..." << endl; << " catch..." << 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