修复传大文件丢包的bug

qieangel2013 · Aug 25, 2016 · 1f9d14e · 1f9d14e
1 parent 91a0519
commit 1f9d14e
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,10 @@
+language: php
+
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+
+script:
+    - exit 0
+
diff --git a/config/config.php b/config/config.php
@@ -14,6 +14,5 @@
 define('ServerLog',dirname(__DIR__).'/log/FileDistributed.log');
 define('redis_server','192.168.102.163');
 define('redis_port','6379');
-define('MYPATH',dirname(__DIR__));
-define('LISTENPATH',dirname(__DIR__));
+define('LISTENPATH',dirname(__DIR__).'/img');
 ?>
diff --git a/img/t018349127914f495ce.jpg b/img/t018349127914f495ce.jpg
diff --git a/server/FileDistributedClient.php b/server/FileDistributedClient.php
@@ -33,11 +33,6 @@ public function __construct()
     public function addServerClient($address)
     {
         $client = new swoole_client(SWOOLE_TCP, SWOOLE_SOCK_ASYNC);
-        /*$client->set(array(
-        'socket_buffer_size' => 1024 * 1024 * 2,
-        'open_eof_check' => true,
-        'package_eof' => "\r\n\r\n",
-        ));*/
         $client->on('Connect', array(
             &$this,
             'onConnect'
@@ -80,6 +75,16 @@ public function onReceive($client, $data)
     {
         $remote_info = json_decode($data, true);
         if ($remote_info['type'] == 'filemes') {
+            $strlendata = file_get_contents($remote_info['data']['path']);
+            $datas      = array(
+                'type' => 'filesize',
+                'data' => array(
+                    'path' => $remote_info['data']['path'],
+                    'filesize' => strlen($strlendata)
+                )
+            );
+            $client->send(json_encode($datas, true));
+        } else if ($remote_info['type'] == 'filesizemes') {
             if ($client->sendfile($remote_info['data']['path'])) {
             }
         }

diff --git a/server/FileDistributedServer.php b/server/FileDistributedServer.php
@@ -22,6 +22,8 @@ class FileDistributedServer
     private $curpath;
     private $curtmp;
     private $filefd;
+    private $filesizes;
+    private $tmpdata;
     private $wd = array();
     public function __construct()
     {
@@ -93,9 +95,9 @@ public function onStart($serv)
             'client' => $localclient
         );
         $this->filefd                                 = inotify_init();
-        $watch_descriptor                             = inotify_add_watch($this->filefd, LISTENPATH, IN_CREATE | IN_MOVED_TO | IN_CLOSE_WRITE); //IN_MODIFY、IN_ALL_EVENTS、IN_CLOSE_WRITE
-        $this->wd[$watch_descriptor]                  = array(
-            'wd' => $watch_descriptor,
+        $wd                                           = inotify_add_watch($this->filefd, LISTENPATH, IN_CREATE | IN_MOVED_TO | IN_CLOSE_WRITE); //IN_MODIFY、IN_ALL_EVENTS、IN_CLOSE_WRITE
+        $this->wd[$wd]                                = array(
+            'wd' => $wd,
             'path' => LISTENPATH
         );
         swoole_event_add($this->filefd, function($fd) use ($localclient)
@@ -105,10 +107,10 @@ public function onStart($serv)
                 foreach ($events as $kk => $vv) {
                     if (isset($vv['name'])) {
                         if ($vv['mask'] == 1073742080) {
-                            $wd            = inotify_add_watch($this->filefd, LISTENPATH . $vv['name'], IN_MOVED_TO | IN_CLOSE_WRITE);
+                            $wd            = inotify_add_watch($this->filefd, LISTENPATH . '/' . $vv['name'], IN_MOVED_TO | IN_CLOSE_WRITE);
                             $this->wd[$wd] = array(
                                 'wd' => $wd,
-                                'path' => LISTENPATH . $vv['name']
+                                'path' => LISTENPATH . '/' . $vv['name']
                             );
                         } else {
                             $path_listen = $this->wd[$vv['wd']]['path'] . '/' . $vv['name'];
@@ -174,30 +176,33 @@ public function onReceive($serv, $fd, $from_id, $data)
                 } else {
                     mkdir(dirname($this->curpath['path']), 0777, true);
                 }
-                $infofile = pathinfo($this->curpath['path']);
-                if (in_array($infofile['extension'], array(
-                    'txt',
-                    'log'
-                ))) {
-                    if (file_put_contents($this->curpath['path'], $data, FILE_APPEND)) {
-                    }
-                } else {
+
+                $this->tmpdata .= $data;
+                if (strlen($this->tmpdata) == $this->filesizes) {
+                    $infofile = pathinfo($this->curpath['path']);
                     if (in_array($infofile['extension'], array(
-                        'jpg',
-                        'png',
-                        'jpeg',
-                        'JPG',
-                        'JPEG',
-                        'PNG',
-                        'bmp'
+                        'txt',
+                        'log'
                     ))) {
-                        if (strlen($data) > 1000) {
-                            if (file_put_contents($this->curpath['path'], $data, FILE_APPEND)) {
+                        if (file_put_contents($this->curpath['path'], $this->tmpdata)) {
+                            $this->tmpdata = 0;
+                        }
+                    } else {
+                        if (in_array($infofile['extension'], array(
+                            'jpg',
+                            'png',
+                            'jpeg',
+                            'JPG',
+                            'JPEG',
+                            'PNG',
+                            'bmp'
+                        ))) {
+                            if (file_put_contents($this->curpath['path'], $this->tmpdata)) {
+                                $this->tmpdata = 0;
                             } //写入图片流
                         }
                     }
                 }
-
             }
         } else {
             if ($remote_info['type'] == 'system' && $remote_info['data']['code'] == 10001) {
@@ -226,6 +231,18 @@ public function onReceive($serv, $fd, $from_id, $data)
                 }
             } else {
                 switch ($remote_info['type']) {
+                    case 'filesize':
+                        if (isset($remote_info['data']['path'])) {
+                            $data_s          = array(
+                                'type' => 'filesizemes',
+                                'data' => array(
+                                    'path' => $remote_info['data']['path']
+                                )
+                            );
+                            $this->filesizes = $remote_info['data']['filesize'];
+                            $serv->send($fd, json_encode($data_s, true));
+                        }
+                        break;
                     case 'file':
                         if (isset($remote_info['data']['path'])) {
                             $this->curpath = $remote_info['data'];