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

DatabaseConnectionNumber property added to configuration class

parent e840ebd8

src/Configuration.h

+11 −5
Original line number Diff line number Diff line
@@ -33,12 +33,14 @@ protected: 
        unsigned int localPort, unsigned int workerNumber,

        std::string databaseHost, unsigned int databasePort,

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

        ExportedTablesMap exportedTablesMap, AuthorisedUsersMap authorisedUsersMap) :

        unsigned int databaseConnectionNumber, ExportedTablesMap exportedTablesMap,

        AuthorisedUsersMap authorisedUsersMap) :

        m_certificateFile(certificateFile), m_privateKeyFile(privateKeyFile),

        m_dHTempFile(dHTempFile), m_localHost(localHost),

        m_localPort(localPort), m_workerNumber(workerNumber),

        m_databaseHost(databaseHost), m_databasePort(databasePort),

        m_databaseUsername(databaseUsername), m_databasePassword(databasePassword),

        m_databaseConnectionNumber(databaseConnectionNumber),

        m_exportedTablesMap(exportedTablesMap), m_authorisedUsersMap(authorisedUsersMap) {}



	virtual ~Configuration() {}
@@ -60,13 +62,13 @@ public: 
        std::string localHost, unsigned int localPort,

        unsigned int workerNumber, std::string databaseHost,

        unsigned int databasePort, std::string databaseUsername,

        std::string databasePassword, ExportedTablesMap exportedTablesMap,

        AuthorisedUsersMap authorisedUsersMap)

        std::string databasePassword, unsigned int databaseConnectionNumber,

        ExportedTablesMap exportedTablesMap, AuthorisedUsersMap authorisedUsersMap)

	{

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

            dHTempFile, localHost, localPort, workerNumber, databaseHost,

            databasePort, databaseUsername, databasePassword, exportedTablesMap,

            authorisedUsersMap), Configuration::Deleter());

            databasePort, databaseUsername, databasePassword, databaseConnectionNumber,

            exportedTablesMap, authorisedUsersMap), Configuration::Deleter());



		return c_sp;

	}
@@ -81,6 +83,7 @@ public: 
	unsigned int getDatabasePort() const { return m_databasePort; };

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

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

    unsigned int getDatabaseConnectionNumber() const { return m_databaseConnectionNumber; }

    ExportedTablesMap& getExportedTablesMap() const { return m_exportedTablesMap; }



    bool isTableExported(const std::string schema, const std::string table)
@@ -145,6 +148,9 @@ protected: 
	//Metadata database login password

	const std::string m_databasePassword;



    //Metadata database connections number

    const unsigned int m_databaseConnectionNumber;



    //Exported tables multi map [schema table]

	ExportedTablesMap m_exportedTablesMap;

src/MetadataExporter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ void MetadataExporter::get_device_property() 
        m_configuration_sp = Configuration::create(certificateFile,

            privateKeyFile, dHTempFile, localHost, localPort, workerNumber,

            databaseHost, databasePort, databaseUsername, databasePassword,

            exportedTablesMap, authorisedUsersMap);

            databaseConnectionNumber, exportedTablesMap, authorisedUsersMap);

    }

    catch(invalid_argument& ex)

    {