update: laravelS v3.4 Fix: guards 被缓存在单例的问题

Author: lisgroup

laravel/bin/fswatch

@@ -9,8 +9,11 @@ echo "Restarting LaravelS..."
 
 echo "Starting fswatch..."
 LOCKING=0
-fswatch -e ".*" -i "\\.php$" ${WORK_DIR} | while read file
+fswatch -e ".*" -i "\\.php$" -m poll_monitor -r ${WORK_DIR} | while read file
 do
+    if [[ ! ${file} =~ .php$ ]] ;then
+        continue
+    fi
     if [ ${LOCKING} -eq 1 ] ;then
         echo "Reloading, skipped."
         continue

laravel/config/laravels.php

@@ -6,7 +6,7 @@
 return [
     'listen_ip'                => env('LARAVELS_LISTEN_IP', '0.0.0.0'),
     'listen_port'              => env('LARAVELS_LISTEN_PORT', 5200),
-    'socket_type'              => defined('SWOOLE_SOCK_TCP') ? \SWOOLE_SOCK_TCP : 1,
+    'socket_type'              => defined('SWOOLE_SOCK_TCP') ? SWOOLE_SOCK_TCP : 1,
     'enable_coroutine_runtime' => false,
     'server'                   => env('LARAVELS_SERVER', 'LaravelS'),
     'handle_static'            => env('LARAVELS_HANDLE_STATIC', false),
@@ -18,8 +18,7 @@
         'excluded_dirs' => [],
         'log'           => true,
     ],
-    'event_handlers'           => [
-    ],
+    'event_handlers'           => [],
     'websocket'                => [
         'enable'  => true, // 看清楚，这里是true
         'handler' => \App\Services\WebSocketService::class,
@@ -42,6 +41,7 @@
             // [\App\Jobs\XxxCronJob::class, [1000, true]], // Pass in parameters when registering
             // \App\Jobs\XxxCronJob::class, // Override the corresponding method to return the configuration
         ],
+        'pid_file'      => storage_path('laravels-timer.pid'),
         'max_wait_time' => 5, // Reload 时最大等待时间
     ],
     // 绑定事件与监听器，一个事件可以有多个监听器，多个监听器按顺序执行
@@ -59,21 +59,20 @@
         //Hhxsv5\LaravelS\Illuminate\Cleaners\SessionCleaner::class, // 如果你的项目中使用到了Session或Authentication，请解除这行注释
         //Hhxsv5\LaravelS\Illuminate\Cleaners\AuthCleaner::class, // 如果你的项目中使用到了Authentication或Passport，请解除这行注释
         Hhxsv5\LaravelS\Illuminate\Cleaners\JWTCleaner::class, // 如果你的项目中使用到了包"tymon/jwt-auth"，请解除这行注释
+        Hhxsv5\LaravelS\Illuminate\Cleaners\RequestCleaner::class,
         //...
     ],
-    'register_providers'       => [
-    ],
     'swoole'                   => [
         'daemonize'          => env('LARAVELS_DAEMONIZE', false),
         // dispatch_mode 只能设置为 2、4、5，https://wiki.swoole.com/wiki/page/277.html
         'dispatch_mode'      => 2,
-        'reactor_num'        => function_exists('\swoole_cpu_num') ? \swoole_cpu_num() * 2 : 4,
-        'worker_num'         => function_exists('\swoole_cpu_num') ? \swoole_cpu_num() * 2 : 8,
-        'task_worker_num'    => function_exists('\swoole_cpu_num') ? \swoole_cpu_num() * 2 : 8,
+        'reactor_num'        => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 4,
+        'worker_num'         => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8,
+        'task_worker_num'    => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8,
         'task_ipc_mode'      => 1,
-        'task_max_request'   => 5000,
+        'task_max_request'   => 8000,
         'task_tmpdir'        => @is_writable('/dev/shm/') ? '/dev/shm' : '/tmp',
-        'max_request'        => 3000,
+        'max_request'        => 8000,
         'open_tcp_nodelay'   => true,
         'pid_file'           => storage_path('laravels.pid'),
         'log_file'           => storage_path(sprintf('logs/swoole-%s.log', date('Y-m'))),