Commit 621270b4 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Improved log messages

parent 784ca5cf

src/request-base.hpp

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ class urd_request { 
public:



    virtual ~urd_request() { }

    virtual void process() = 0;

    virtual bool validate() const = 0;

    virtual std::string to_string() const = 0;



    //static urd_request* create_from_buffer(const void* data, int size);

    static urd_request* create_from_buffer(const std::vector<uint8_t>& data, int size);

src/requests.cpp

+22 −3
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
//



#include "requests.hpp"

#include <iostream>

#include <sstream>

#include <boost/algorithm/string/join.hpp>

#include <boost/range/adaptor/transformed.hpp>



job_registration_request::job_registration_request(uint32_t jobid) 

 : m_jobid(jobid) { }
@@ -40,7 +42,24 @@ std::vector<std::string> job_registration_request::hosts() const { 
//     return m_backends;

// }



void job_registration_request::process() {

bool job_registration_request::validate() const {

    return true;

}



std::string job_registration_request::to_string() const {



    using boost::algorithm::join;

    using boost::adaptors::transformed;



    std::stringstream ss;



    auto to_string = [](const backend& b) {

        return b.to_string();

    };



    ss << "id: " << m_jobid << ", "

       << "hosts: {" << join(m_hosts, ", ") << "}; "

       << "backends: {" << join(m_backends | transformed(to_string), ", ");



    std::cerr << std::dec << "Ho ho! " << m_jobid << "\n";

    return ss.str();

}

src/requests.hpp

+11 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <cstdint>

#include <vector>

#include <string>

#include <sstream>



#include "request-base.hpp"
@@ -37,6 +38,14 @@ class job_registration_request : public urd_request { 
        int32_t     m_type;

        std::string m_mount;

        int32_t     m_quota;



        std::string to_string() const {

            std::stringstream ss;



            ss << "{" << m_type << ", " << m_mount << ", " << m_quota << "}";



            return ss.str();

        }

    };



    friend class urd_request;
@@ -47,7 +56,8 @@ public: 
    std::vector<std::string> hosts() const;

//    std::vector<backend> backends() const;



    void process();

    bool validate() const;

    std::string to_string() const;



private:

    uint32_t                    m_jobid;

src/response-base.hpp

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public: 
    virtual ~urd_response() { }



    virtual bool store_to_buffer(std::vector<uint8_t>& buffer) = 0;

    virtual std::string to_string() const = 0;

};



#endif /* __RESPONSE_HPP__ */

src/responses.cpp

+8 −1
Original line number Diff line number Diff line
@@ -24,7 +24,10 @@ 


#include "messages.pb.h"

#include "responses.hpp"

#include <iostream>

#include "utils.hpp"

#include <sstream>

#include <boost/algorithm/string/join.hpp>

#include <boost/range/adaptor/transformed.hpp>



job_registration_response::job_registration_response() 

 : m_error_code(0) { }
@@ -51,3 +54,7 @@ bool job_registration_response::store_to_buffer(std::vector<uint8_t>& buffer) { 


    return rpc_resp.SerializeToArray(&buffer[reserved_size], message_size);

}



std::string job_registration_response::to_string() const {

    return utils::error_code_to_string(m_error_code);

}