|
@@ -58,15 +58,15 @@ class ServerAction extends \Action {
|
|
|
protected function logDebug( $msg ){
|
|
|
if (!APP_DEBUG)
|
|
|
return;
|
|
|
- $logger = \Jiaruan\FileLogger::getInstance(SOLUTION_LOG_PATH . APP_PREFIX .'/');
|
|
|
- $logger->log('',\Jiaruan\FileLogger::DEBUG,$msg);
|
|
|
+ $logger = \Logger\FileLogger::getInstance(SOLUTION_LOG_PATH . APP_PREFIX .'/');
|
|
|
+ $logger->log('',\Logger\FileLogger::DEBUG,$msg);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
protected function logError( $msg ){
|
|
|
- $logger = \Jiaruan\FileLogger::getInstance(SOLUTION_LOG_PATH .APP_PREFIX .'/');
|
|
|
- $logger->log('',\Jiaruan\FileLogger::ERROR,$msg);
|
|
|
+ $logger = \Logger\FileLogger::getInstance(SOLUTION_LOG_PATH .APP_PREFIX .'/');
|
|
|
+ $logger->log('',\Logger\FileLogger::ERROR,$msg);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -196,7 +196,7 @@ class ServerAction extends \Action {
|
|
|
|
|
|
|
|
|
protected function onMessage( $connection, $data, $raw ){
|
|
|
- $raw_msg = $this->mIsBinaryProto ? \Jms\String\BinText::bin2str($raw,true) : $raw;
|
|
|
+ $raw_msg = $this->mIsBinaryProto ? $this->bin2str($raw,true) : $raw;
|
|
|
$this->logDebug("message:" . $raw_msg );
|
|
|
if(!$data){
|
|
|
$this->logError("message decode failed " . $raw_msg);
|
|
@@ -250,5 +250,17 @@ class ServerAction extends \Action {
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ protected function bin2str( $hex, $space = false ){
|
|
|
+ $data = unpack("C*chars",$hex);
|
|
|
+ $bin = '';
|
|
|
+ foreach($data as $key=>$value){
|
|
|
+ $bin .= sprintf('%02X',$value);
|
|
|
+ if($space)
|
|
|
+ $bin .= ' ';
|
|
|
+ }
|
|
|
+ return trim($bin);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|