Merge pull request #79 from netlify/get-functions-port

Make sure we always choose a free port for function server
netlify · Apr 4, 2019 · 5c3eae9 · 5c3eae9
2 parents 56e3069 + f604949
commit 5c3eae9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/commands/dev/index.js b/src/commands/dev/index.js
@@ -96,7 +96,6 @@ function startDevServer(settings, log, error) {
     server.start(function() {
       log("Server listening to", settings.proxyPort);
     });
-    return;
   } else {
     log(`Starting netlify dev with ${settings.type}`);
     const ps = execa(settings.command, settings.args, {
@@ -180,8 +179,13 @@ class DevCommand extends Command {
     startDevServer(settings, this.log, this.error);
 
     if (functionsDir) {
-      const fnSettings = await serveFunctions({ ...settings, functionsDir });
-      settings.functionsPort = fnSettings.port;
+      const functionsPort = await getPort({ port: 34567 });
+      const fnSettings = await serveFunctions({
+        ...settings,
+        port: functionsPort,
+        functionsDir
+      });
+      settings.functionsPort = functionsPort;
     }
 
     const proxyUrl = await startProxy(settings, addonUrls);