Commit ce41f509 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

fixed a problem in scheduler after the merge

parent 1975522e

Common/Servers/Moon/src/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ MoonImpl_LIBS = EphemGeneratorStubs MoonStubs baci maci IRALibrary SlaLibrary Ob 


test_moon_OBJECTS = test_moon

test_moon_LIBS = baci IRALibrary SlaLibrary EphemGeneratorStubs ComponentErrors AntennaErrors   \

                     AntennaDefinitionsStubs

                     AntennaDefinitionsStubs ManagmentDefinitionsStubs ObservatoryStubs ManagementErrors

#

# list of all possible C-sources (used to create automatic dependencies)

# ------------------------------

Common/Servers/Scheduler/src/Core_Operations.i

+2 −6
Original line number Diff line number Diff line
@@ -298,17 +298,13 @@ void CCore::_changeLogFile(const char *fileName) throw (ComponentErrors::Couldnt 
{

	baci::ThreadSyncGuard guard(&m_mutex);

	loadCustomLogger(m_customLogger,m_customLoggerError); // throw ComponentErrors::CouldntGetComponentExImpl

	IRA::CString fullName,fullSysName;

	IRA::CString fullName;

	IRA::CString logName(fileName);

	fullName=logName+".log";

	fullSysName=logName+".xml";

	ACS_LOG(LM_FULL_INFO,"CCore::changeLogFile()",(LM_NOTICE,"NEW_LOG_FILE: %s",(const char *)fullName));

	try {

		m_customLogger->flush();

		m_customLogger->setLogfile((const char *)m_config->getLogDirectory(),

																	 (const char *)m_config->getSystemLogDirectory(),

																	 (const char *)fullName,

																	 (const char *)fullSysName);

		m_customLogger->setLogfile((const char *)m_config->getLogDirectory(),(const char *)fullName);

	}

	catch (CORBA::SystemException& ex) {

		_EXCPT(ComponentErrors::CORBAProblemExImpl,impl,"CCore::changeLogFile()");

Common/Servers/Scheduler/src/ScheduleExecutor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ void CScheduleExecutor::startSchedule(const char* scheduleFile,const char * subS 
        logfile_name <<  currentUT.second();

        /* Change log file with the new name 

         * ================================= */

 	m_core->changeLogFile((const char *)logfile_name.str().c_str()); //  (ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::CORBAProblemExImpl,ManagementErrors::LogFileErrorExImpl);

 	m_core->_changeLogFile((const char *)logfile_name.str().c_str()); //  (ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::CORBAProblemExImpl,ManagementErrors::LogFileErrorExImpl);

 	// load the procedures associated to the schedule

 	m_core->loadProceduresFile(m_schedule->getPreScanProcedureList());

 	m_active=true;