Merge branch 'feat/configurable-watch-paths'

Author: taylorotwell

README.md

@@ -132,6 +132,8 @@ Before using this feature, you should ensure that [Node](https://nodejs.org) is
 npm install --save-dev chokidar
 ```
 
+You may configure the directories and files that should be watched using the `watch` configuration option within your application's `config/octane.php` configuration file.
+
 #### Specifying The Worker Count
 
 By default, Octane will start an application request worker for each CPU core provided by your machine. However, you may manually specify how many workers you would like to start using the `--workers` option when invoking the `octane:start` command:

bin/file-watcher.js

@@ -1,23 +1,10 @@
 const chokidar = require('chokidar');
 
-const basePath = process.argv[2];
+const paths = JSON.parse(process.argv[2]);
 
-const watcher = chokidar.watch(
-    [
-        basePath + '/app',
-        basePath + '/bootstrap',
-        basePath + '/config',
-        basePath + '/database',
-        basePath + '/public',
-        basePath + '/resources',
-        basePath + '/routes',
-        basePath + '/composer.lock',
-        basePath + '/.env',
-    ],
-    {
-        ignoreInitial: true,
-    }
-);
+const watcher = chokidar.watch(paths, {
+    ignoreInitial: true,
+});
 
 watcher
     .on('add', () => console.log('File added...'))

config/octane.php

@@ -122,30 +122,6 @@
         //
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Garbage Collection Threshold
-    |--------------------------------------------------------------------------
-    |
-    | When executing long-lived PHP scripts such as Octane, memory can build
-    | up before being cleared by PHP. You can force Octane to run garbage
-    | collection if your application consumes this amount of megabytes.
-    |
-    */
-
-    'garbage' => 50,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Maximum Execution Time
-    |--------------------------------------------------------------------------
-    |
-    | (info) 0 means no maximum limit
-    |
-    */
-
-    'max_execution_time' => 30,
-
     /*
     |--------------------------------------------------------------------------
     | Octane Cache Table
@@ -180,4 +156,53 @@
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | File Watching
+    |--------------------------------------------------------------------------
+    |
+    | The following list of files and directories will be watched when using
+    | the --watch option offered by Octane. If any of the directories and
+    | files are changed, Octane will automatically reload your workers.
+    |
+    */
+
+    'watch' => [
+        'app',
+        'bootstrap',
+        'config',
+        'database',
+        'public',
+        'resources',
+        'routes',
+        'composer.lock',
+        '.env',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Garbage Collection Threshold
+    |--------------------------------------------------------------------------
+    |
+    | When executing long-lived PHP scripts such as Octane, memory can build
+    | up before being cleared by PHP. You can force Octane to run garbage
+    | collection if your application consumes this amount of megabytes.
+    |
+    */
+
+    'garbage' => 50,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Maximum Execution Time
+    |--------------------------------------------------------------------------
+    |
+    | The following setting configures the maximum execution time for requests
+    | being handled by Octane. You may set this value to 0 to indicate that
+    | there isn't a specific time limit on Octane request execution time.
+    |
+    */
+
+    'max_execution_time' => 30,
+
 ];

src/Commands/Concerns/InteractsWithServers.php

@@ -2,6 +2,7 @@
 
 namespace Laravel\Octane\Commands\Concerns;
 
+use InvalidArgumentException;
 use Laravel\Octane\Exceptions\ServerShutdownException;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\Process;
@@ -90,8 +91,16 @@ public function __call($method, $parameters)
             };
         }
 
+        if (empty($paths = config('octane.watch'))) {
+            throw new InvalidArgumentException(
+                'List of directories/files to watch not found. Please update your "config/octane.php" configuration file.',
+            );
+        }
+
         return tap(new Process([
-            (new ExecutableFinder)->find('node'), 'file-watcher.js', base_path(),
+            (new ExecutableFinder)->find('node'),
+            'file-watcher.js',
+            json_encode(collect(config('octane.watch'))->map(fn ($path) => base_path($path))),
         ], realpath(__DIR__.'/../../../bin'), null, null, null))->start();
     }