Skip to content

Commit

Permalink
fix response for web socket server
Browse files Browse the repository at this point in the history
  • Loading branch information
@roman-modelist-dev
roman-modelist-dev committed Nov 16, 2018
1 parent f99edfd commit 970055d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 37 deletions.
62 changes: 31 additions & 31 deletions keychain_lib/include/keychain_lib/keychain_commands.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ struct keychain_command: keychain_command_base
virtual ~keychain_command(){}
virtual std::string operator()(keychain_base* keychain, const fc_light::variant& params_variant, int id) const override
{
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, "method is not implemented")));
return fc_light::json::to_string(fc_light::variant(json_error(id, "method is not implemented")));
}
using params_t = void;
};
Expand Down Expand Up @@ -358,17 +358,17 @@ struct keychain_command<command_te::sign_hex> : keychain_command_base

json_response response(to_hex(signature.data(), signature.size()).c_str(), id);
fc_light::variant res(response);
return fc_light::json::to_pretty_string(res);
return fc_light::json::to_string(res);
}
catch (const std::exception &exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
catch (const fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
}
}
};
Expand Down Expand Up @@ -457,17 +457,17 @@ struct keychain_command<command_te::sign_hash> : keychain_command_base

json_response response(to_hex(signature.data(), signature.size()).c_str(), id);
fc_light::variant res(response);
return fc_light::json::to_pretty_string(res);
return fc_light::json::to_string(res);
}
catch (const std::exception &exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
catch (const fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
}
}
};
Expand Down Expand Up @@ -537,17 +537,17 @@ struct keychain_command<command_te::create>: keychain_command_base
create_keyfile(filename.c_str(), fc_light::variant(keyfile));

json_response response(true, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (const std::exception &exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
catch (const fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
}
}
};
Expand Down Expand Up @@ -576,17 +576,17 @@ struct keychain_command<command_te::list>: keychain_command_base {
return;
});
json_response response(keyname_list, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (const std::exception &exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
catch (const fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
}
}
};
Expand Down Expand Up @@ -614,17 +614,17 @@ struct keychain_command<command_te::remove>: keychain_command_base
bfs::remove(*it);
}
json_response response(true, id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (const std::exception &exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
catch (const fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
}
}
};
Expand Down Expand Up @@ -654,17 +654,17 @@ struct keychain_command<command_te::public_key>: keychain_command_base
throw std::runtime_error("Error: keyfile could not found by keyname");

json_response response(keyfile.keyinfo.public_key.c_str(), id);
return fc_light::json::to_pretty_string(fc_light::variant(response));
return fc_light::json::to_string(fc_light::variant(response));
}
catch (const std::exception &exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(id, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(id, exc.what()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(id, exc.what())));
}
catch (const fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
}
}
};
Expand Down
4 changes: 2 additions & 2 deletions keychain_lib/src/keychain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ std::string keychain::operator()(const fc_light::variant& command) {
}
catch(fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
return fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
}
}

Expand Down
10 changes: 6 additions & 4 deletions keychain_lib/src/pipeline_parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,18 @@ int pipeline_parser::run()
std::string res = m_keychain_func(fc_light::json::from_string(std::string(buf_range.first, buf_range.second)));
std::stringstream strbuf(std::ios_base::out);
strbuf << res << std::endl;
write(m_pipeout_desc, static_cast<const void*>(strbuf.str().c_str()), res.size());
std::string output = strbuf.str();
write(m_pipeout_desc, static_cast<const void*>(output.c_str()), output.size());
BOOST_LOG_SEV(log.lg, info) <<"stdout:" << res;
}
catch(fc_light::exception& exc)
{
std::cerr << fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
std::string res = fc_light::json::to_pretty_string(fc_light::variant(json_error(0, exc.what())));
std::cerr << fc_light::json::to_string(fc_light::variant(json_error(0, exc.to_detail_string().c_str()))) << std::endl;
std::string res = fc_light::json::to_string(fc_light::variant(json_error(0, exc.what())));
std::stringstream strbuf(std::ios_base::out);
strbuf << res << std::endl;
write(m_pipeout_desc, static_cast<const void*>(strbuf.str().c_str()), res.size());
std::string output = strbuf.str();
write(m_pipeout_desc, static_cast<const void*>(output.c_str()), output.size());
BOOST_LOG_SEV(log.lg, error) <<"stdout:" << res;
}
it = std::copy(buf_range.second, it, read_buf.begin());
Expand Down

0 comments on commit 970055d

Please sign in to comment.