Commit a940efa9 authored by Andrea Orlati's avatar Andrea Orlati
Browse files

Merge branch 'master' of https://github.com/discos/discos into fix-issue-588

parents fa40d772 103d180f

Common/Servers/AntennaBoss/src/BossCore_extra.i

+11 −0
Original line number Diff line number Diff line
@@ -122,6 +122,17 @@ void CBossCore::preset(const double& az,const double& el) throw (ComponentErrors 
		changeBossStatus(Management::MNG_FAILURE);

		throw impl;

	}

	catch (AntennaErrors::AntennaErrorsEx& ex) {

		_ADD_BACKTRACE(ComponentErrors::CouldntCallOperationExImpl,impl,ex,"CBossCore::preset()");

		impl.setComponentName((const char*)m_mount->name());

		impl.setOperationName("preset()");

		changeBossStatus(Management::MNG_WARNING);

		throw impl;

	}

	catch (...) {

		changeBossStatus(Management::MNG_FAILURE);

		_THROW_EXCPT(ComponentErrors::UnexpectedExImpl,"CBossCore::preset()");

	}

}



#endif

Common/Servers/Scheduler/src/ScheduleExecutor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ void CScheduleExecutor::cleanSchedule(bool error) 
			ACS_LOG(LM_FULL_INFO,"CScheduleExecutor::cleanSchedule()",(LM_NOTICE,"END_OF_SCHEDULE"));

		}

	}

	if (m_schedReport.deactivate()) {

	if (!m_schedReport.deactivate()) {

		IRA::CString msg;

		msg.Format("Error in schedule reporting: %s",(const char *)m_schedReport.getLastError());

		ACS_LOG(LM_FULL_INFO,"CScheduleExecutor::cleanSchedule()",(LM_WARNING,"%s",(const char *)msg));

SRT/CDB/MACI/Channels/PositionerData/PositionerData.xml

deleted100755 → 0
+0 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<EventChannel xmlns="urn:schemas-cosylab-com:EventChannel:1.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	IntegrationLogs="false"

	MaxQueueLength="5"

	MaxSuppliers="20"

	RejectNewEvents="false"

	DiscardPolicy="FifoOrder"

	EventReliability="BestEffort"

	ConnectionReliability="Persistent">

   <Events>

     <_ Name="PositionerDataBlock" MaxProcessTime="2.0"/>

   </Events>

</EventChannel>

SRT/CDB/MACI/Components/BACKENDS/Sardara/Sardara.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

   - History:

   -   

-->

<Component xmlns="urn:schemas-cosylab-com:Component:1.0" 

           xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

           xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

              

	Name="Sardara"

	Code="SardaraImpl"

	Type="IDL:alma/Backends/Sardara:1.0"

	Container="SardaraContainer"

	KeepAliveTime="-1"

	ImplLang="cpp"

/>

SRT/CDB/MACI/Containers/SardaraContainer/SardaraContainer.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>



<Container

	xmlns="urn:schemas-cosylab-com:Container:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"

	Timeout="150.0"

	UseIFR="true"

	ManagerRetry="10"

	ImplLang="cpp"

	Recovery="false">



	<Autoload>

		<cdb:_ string="baci" />

	</Autoload>

	

	<LoggingConfig

		centralizedLogger="Log"

		minLogLevel="5"

		minLogLevelLocal="5"

		dispatchPacketSize="0"

		immediateDispatchLevel="8"

		flushPeriodSeconds="1"

	>

	</LoggingConfig>

	

</Container>