Rev 1959 | Rev 1986 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 1959 | Rev 1962 | ||
|---|---|---|---|
| Line 72... | Line 72... | ||
| 72 | LOG_DEBUG_EXIT; |
72 | LOG_DEBUG_EXIT; |
| 73 | } |
73 | } |
| 74 | 74 | ||
| 75 | void Socket::CallOutput(unsigned int request_id, std::string output) |
75 | void Socket::CallOutput(unsigned int request_id, std::string output) |
| 76 | { |
76 | { |
| 77 | LOG_DEBUG_ENTER |
77 | //LOG_DEBUG_ENTER; |
| 78 | 78 | ||
| 79 | log::Info(log_module_, output); |
79 | log::Info(log_module_, output); |
| 80 | 80 | ||
| 81 | LOG_DEBUG_EXIT |
81 | //LOG_DEBUG_EXIT; |
| 82 | } |
82 | } |
| 83 | 83 | ||
| 84 | void Socket::SlotOnNewData(net::SocketId socket_id, net::SocketId server_id, common::Byteset data) |
84 | void Socket::SlotOnNewData(net::SocketId socket_id, net::SocketId server_id, common::Byteset data) |
| 85 | { |
85 | { |
| 86 | LOG_DEBUG_ENTER; |
86 | LOG_DEBUG_ENTER; |
| 87 | - | ||
| 88 | log::Debug(log_module_, data.ToDebugString()); |
- | |
| 89 | 87 | ||
| 90 | this->io_service_.post(boost::bind(&Socket::SlotOnNewDataHandler, this, socket_id, server_id, data)); |
88 | this->io_service_.post(boost::bind(&Socket::SlotOnNewDataHandler, this, socket_id, server_id, data)); |
| 91 | 89 | ||
| 92 | LOG_DEBUG_EXIT; |
90 | LOG_DEBUG_EXIT; |
| 93 | } |
91 | } |
| Line 115... | Line 113... | ||
| 115 | atom::log::Error(log_module_, "Got empty data!"); |
113 | atom::log::Error(log_module_, "Got empty data!"); |
| 116 | return; |
114 | return; |
| 117 | } |
115 | } |
| 118 | 116 | ||
| 119 | arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(socket_id))); |
117 | arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(socket_id))); |
| - | 118 | arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(server_id))); |
|
| 120 | arguments->push_back(v8::String::New(data.ToCharString().c_str())); |
119 | arguments->push_back(v8::String::New(data.ToCharString().c_str())); |
| 121 | 120 | ||
| 122 | if (!this->Call(socket_id, "Socket_OnNewData", arguments)) |
121 | if (!this->Call(socket_id, "Socket_OnNewData", arguments)) |
| 123 | { |
122 | { |
| 124 | atom::log::Error(log_module_, "%s failed!", __FUNCTION__); |
123 | atom::log::Error(log_module_, "%s failed!", __FUNCTION__); |
| Line 140... | Line 139... | ||
| 140 | try |
139 | try |
| 141 | { |
140 | { |
| 142 | ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList); |
141 | ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList); |
| 143 | 142 | ||
| 144 | arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(socket_id))); |
143 | arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(socket_id))); |
| - | 144 | arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(server_id))); |
|
| 145 | arguments->push_back(v8::Uint32::New((unsigned int)client_state)); |
145 | arguments->push_back(v8::Uint32::New((unsigned int)client_state)); |
| 146 | 146 | ||
| 147 | if (!this->Call(socket_id, "Socket_OnNewState", arguments)) |
147 | if (!this->Call(socket_id, "Socket_OnNewState", arguments)) |
| 148 | { |
148 | { |
| 149 | atom::log::Error(log_module_, "%s failed!", __FUNCTION__); |
149 | atom::log::Error(log_module_, "%s failed!", __FUNCTION__); |