From 0cd7ba2db6ef83d2bad256ed45e683288fb3bdab Mon Sep 17 00:00:00 2001 From: Georgi Panayotov Date: Tue, 30 Oct 2018 18:32:06 +0200 Subject: [PATCH 1/2] Locally use the options to read the port --- lib-src/cfenv.coffee | 2 +- lib/cfenv.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib-src/cfenv.coffee b/lib-src/cfenv.coffee index 460ffc6..68a0e8f 100644 --- a/lib-src/cfenv.coffee +++ b/lib-src/cfenv.coffee @@ -166,7 +166,7 @@ getServices = (appEnv, options) -> #------------------------------------------------------------------------------- getPort = (appEnv) -> - portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT + portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT || AppEnv?.app?.port unless portString? return 3000 unless appEnv.name? diff --git a/lib/cfenv.js b/lib/cfenv.js index 89776ce..ebe0dfd 100644 --- a/lib/cfenv.js +++ b/lib/cfenv.js @@ -215,8 +215,8 @@ }; getPort = function(appEnv) { - var port, portString; - portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT; + var port, portString, ref; + portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT || (AppEnv != null ? (ref = AppEnv.app) != null ? ref.port : void 0 : void 0); if (portString == null) { if (appEnv.name == null) { return 3000; From f9012e8d63b12e682e3f72ba6f90d6adfd31bbc2 Mon Sep 17 00:00:00 2001 From: Georgi Panayotov Date: Tue, 30 Oct 2018 18:53:32 +0200 Subject: [PATCH 2/2] Fix typo --- lib-src/cfenv.coffee | 2 +- lib/cfenv.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-src/cfenv.coffee b/lib-src/cfenv.coffee index 68a0e8f..4082ef4 100644 --- a/lib-src/cfenv.coffee +++ b/lib-src/cfenv.coffee @@ -166,7 +166,7 @@ getServices = (appEnv, options) -> #------------------------------------------------------------------------------- getPort = (appEnv) -> - portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT || AppEnv?.app?.port + portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT || appEnv?.app?.port unless portString? return 3000 unless appEnv.name? diff --git a/lib/cfenv.js b/lib/cfenv.js index ebe0dfd..6b7fcfb 100644 --- a/lib/cfenv.js +++ b/lib/cfenv.js @@ -216,7 +216,7 @@ getPort = function(appEnv) { var port, portString, ref; - portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT || (AppEnv != null ? (ref = AppEnv.app) != null ? ref.port : void 0 : void 0); + portString = process.env.PORT || process.env.CF_INSTANCE_PORT || process.env.VCAP_APP_PORT || (appEnv != null ? (ref = appEnv.app) != null ? ref.port : void 0 : void 0); if (portString == null) { if (appEnv.name == null) { return 3000;