Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
Arthur Britto
2012-11-05 16:16:08 -08:00
2 changed files with 5 additions and 0 deletions

3
.gitignore vendored
View File

@@ -23,3 +23,6 @@ node_modules
# Ignore tmp directory.
tmp
# Ignore database directory.
db/*.db

View File

@@ -90,6 +90,8 @@ public:
Json::Value jvRequest;
Json::Reader jrReader;
cLog(lsDEBUG) << "Ws:: Receiving '" << mpMessage->get_payload() << "'";
if (mpMessage->get_opcode() != websocketpp::frame::opcode::TEXT)
{
Json::Value jvResult(Json::objectValue);