Commit a8580174 authored by Marco De Marco's avatar Marco De Marco
Browse files

Minor fixes

parent a2c82875

src/Configuration.h

+28 −25
Original line number Diff line number Diff line
@@ -45,38 +45,41 @@ private: 


public:

//------------------------------------------------------------------------------

//	[Public] User methods

//	[Public] Create class method

//------------------------------------------------------------------------------

	static Configuration::SP create(std::string m_certificateFile,

        std::string m_remoteHost, unsigned int m_remotePort,

        std::string m_remoteUsername, std::string m_remotePassword,

        std::string m_databaseHost, unsigned int m_databasePort,

        std::string m_databaseUsername, std::string m_databasePassword,

        std::string m_databaseSchema, std::string m_databaseTable,

        unsigned int m_refreshTime, unsigned int m_timeout)

	static Configuration::SP create(std::string certificateFile,

        std::string remoteHost, unsigned int remotePort,

        std::string remoteUsername, std::string remotePassword,

        std::string databaseHost, unsigned int databasePort,

        std::string databaseUsername, std::string databasePassword,

        std::string databaseSchema, std::string databaseTable,

        unsigned int refreshTime, unsigned int timeout)

	{

		Configuration::SP c_sp(new Configuration(m_certificateFile, m_remoteHost,

            m_remotePort, m_remoteUsername, m_remotePassword, m_databaseHost,

            m_databasePort, m_databaseUsername, m_databasePassword,

            m_databaseSchema, m_databaseTable, m_refreshTime, m_timeout),

		Configuration::SP c_sp(new Configuration(certificateFile, remoteHost,

            remotePort, remoteUsername, remotePassword, databaseHost,

            databasePort, databaseUsername, databasePassword,

            databaseSchema, databaseTable, refreshTime, timeout),

            Configuration::Deleter());



		return c_sp;

	}



	std::string	getCertificateFile() const { return m_certificateFile; };

	std::string	getRemoteHost() const { return m_remoteHost; };

	unsigned int getRemotePort() const { return m_remotePort; };

	std::string	getRemoteUsername() const { return m_remoteUsername; };

	std::string	getRemotePassword() const { return m_remotePassword; };

	std::string	getDatabaseHost() const { return m_databaseHost; };

	unsigned int getDatabasePort() const { return m_databasePort; };

	std::string	getDatabaseUsername() const { return m_databaseUsername; };

	std::string	getDatabasePassword() const { return m_databasePassword; };

	std::string	getDatabaseSchema() const { return m_databaseSchema; };

	std::string	getDatabaseTable() const { return m_databaseTable; };

	unsigned int getRefreshTime() const { return m_refreshTime; };

	unsigned int getTimeout() const { return m_timeout; };

//------------------------------------------------------------------------------

//	[Public] Getter methods

//------------------------------------------------------------------------------

	std::string	getCertificateFile() const { return m_certificateFile; }

	std::string	getRemoteHost() const { return m_remoteHost; }

	unsigned int getRemotePort() const { return m_remotePort; }

	std::string	getRemoteUsername() const { return m_remoteUsername; }

	std::string	getRemotePassword() const { return m_remotePassword; }

	std::string	getDatabaseHost() const { return m_databaseHost; }

	unsigned int getDatabasePort() const { return m_databasePort; }

	std::string	getDatabaseUsername() const { return m_databaseUsername; }

	std::string	getDatabasePassword() const { return m_databasePassword; }

	std::string	getDatabaseSchema() const { return m_databaseSchema; }

	std::string	getDatabaseTable() const { return m_databaseTable; }

	unsigned int getRefreshTime() const { return m_refreshTime; }

	unsigned int getTimeout() const { return m_timeout; }



private:

//------------------------------------------------------------------------------

src/MetadataImporter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ void MetadataImporter::get_device_property() 
    {

        set_state(Tango::FAULT);

        stringstream error_stream;

        error_stream << "FitsImporter::get_device_property() " << ex.what() << endl;

        error_stream << "MetadataImporter::get_device_property() " << ex.what() << endl;

        set_status(error_stream.str());

    }

src/PlainClient.cpp

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ void PlainClient::handleConnect(const boost::system::error_code& errorCode, 


        INFO_STREAM << "PlainClient::handleConnect() " << m_remoteEndpoint << endl;



        writeState(Tango::ON);

        writeStatus(infoStream.str());



        m_protocolManager_sp->setRemoteEndpoint(m_remoteEndpoint);

src/SSLClient.cpp

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ void SSLClient::handleHandShake(const boost::system::error_code& errorCode) 


        INFO_STREAM << "SSLClient::handleHandShake() " << infoStream.str() << endl;



        writeState(Tango::ON);

        writeStatus(infoStream.str());



        m_protocolManager_sp->setRemoteEndpoint(m_remoteEndpoint);