Commit 7f65e5e5 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Move and rename config_settings to config::settings

parent de756560

src/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int main(int argc, char* argv[]){ 
        exit(EXIT_FAILURE);

    }



    norns::config_settings settings;

    norns::config::settings settings;



    settings.load(norns::defaults::config_file);

src/settings.cpp

+8 −1
Original line number Diff line number Diff line
@@ -30,14 +30,20 @@ 
#include <boost/property_tree/ptree.hpp>

#include <boost/property_tree/json_parser.hpp>



#include <boost/filesystem.hpp>



#include "utils.hpp"

#include "settings/file-options.hpp" //XXX move to folder

#include "settings/config-schema.hpp"

#include "settings.hpp"



namespace bpt = boost::property_tree;

namespace bfs = boost::filesystem;



namespace norns {

namespace config {



void config_settings::load(const std::string& filename) {

void settings::load(const std::string& filename) {



    bpt::ptree pt;
@@ -136,5 +142,6 @@ void config_settings::load(const std::string& filename) { 
#endif

}



} // namespace config

} // namespace norns

src/settings.hpp

+5 −1
Original line number Diff line number Diff line
@@ -31,16 +31,19 @@ 
#include <thread>

#include <list>

#include <boost/property_tree/ptree.hpp>

#include <boost/filesystem.hpp>



#include <netinet/in.h>



#include "defaults.hpp"



namespace bpt = boost::property_tree;

namespace bfs = boost::filesystem;



namespace norns {

namespace config {



struct config_settings {

struct settings {



    struct backend {
@@ -78,6 +81,7 @@ struct config_settings { 
    std::list<backend> m_backends;         /* list of backend descriptions */

};



} // namespace config

} // namespace norns



#endif /* __SETTINGS_HPP__ */

src/urd.cpp

+2 −2
Original line number Diff line number Diff line
@@ -624,8 +624,8 @@ response_ptr urd::unknown_request_handler(const request_ptr /*base_request*/) { 
    return resp;

}



void urd::configure(const config_settings& settings) {

    m_settings = std::make_shared<config_settings>(settings);

void urd::configure(const config::settings& settings) {

    m_settings = std::make_shared<config::settings>(settings);

}



void urd::signal_handler(int signum){

src/urd.hpp

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ class urd { 
public:

    urd();

    ~urd();

    void configure(const config_settings& settings);

    void configure(const config::settings& settings);

    int run();

    void teardown();
@@ -111,7 +111,7 @@ private: 
    response_ptr unknown_request_handler(const request_ptr req);



private:

    std::shared_ptr<config_settings>                    m_settings;

    std::shared_ptr<config::settings>                    m_settings;

    std::unique_ptr<io::transferor_registry> m_transferor_registry;



    thread_pool_ptr m_workers;