From e2442a96049e1c8c071f1139739b4125057e2e77 Mon Sep 17 00:00:00 2001 From: Rafael Leon Date: Thu, 3 Aug 2023 09:21:47 -0400 Subject: [PATCH 1/3] Fix a NODE_OPTIONS bug when using App-Insights --- src/startupscriptgenerator/src/node/scriptgenerator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/startupscriptgenerator/src/node/scriptgenerator.go b/src/startupscriptgenerator/src/node/scriptgenerator.go index ce649a09b4..46e862902d 100644 --- a/src/startupscriptgenerator/src/node/scriptgenerator.go +++ b/src/startupscriptgenerator/src/node/scriptgenerator.go @@ -207,7 +207,7 @@ func (gen *NodeStartupScriptGenerator) GenerateEntrypointScript() string { if gen.shouldApplicationInsightsBeConfigured() { loaderFile := filepath.Join(consts.NodeGlobalModulesPath, consts.NodeAppInsightsLoaderFileName) - var nodeOptions = "'--require " + loaderFile + " ' $NODE_OPTIONS" + var nodeOptions = "'--require " + loaderFile + " $NODE_OPTIONS '" scriptBuilder.WriteString("export NODE_OPTIONS=" + nodeOptions + "\n") } scriptBuilder.WriteString(startupCommand + "\n") From 86f55799445fe04e458f701c30bededdd14048bc Mon Sep 17 00:00:00 2001 From: Rafael Leon Date: Thu, 3 Aug 2023 19:42:41 -0400 Subject: [PATCH 2/3] Append NODE_OPTIONS correctly --- src/startupscriptgenerator/src/node/scriptgenerator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/startupscriptgenerator/src/node/scriptgenerator.go b/src/startupscriptgenerator/src/node/scriptgenerator.go index 46e862902d..ce649a09b4 100644 --- a/src/startupscriptgenerator/src/node/scriptgenerator.go +++ b/src/startupscriptgenerator/src/node/scriptgenerator.go @@ -207,7 +207,7 @@ func (gen *NodeStartupScriptGenerator) GenerateEntrypointScript() string { if gen.shouldApplicationInsightsBeConfigured() { loaderFile := filepath.Join(consts.NodeGlobalModulesPath, consts.NodeAppInsightsLoaderFileName) - var nodeOptions = "'--require " + loaderFile + " $NODE_OPTIONS '" + var nodeOptions = "'--require " + loaderFile + " ' $NODE_OPTIONS" scriptBuilder.WriteString("export NODE_OPTIONS=" + nodeOptions + "\n") } scriptBuilder.WriteString(startupCommand + "\n") From 3bf32c9f1db86189a1dffbe560399e912274268f Mon Sep 17 00:00:00 2001 From: Rafael Leon Date: Thu, 3 Aug 2023 19:44:40 -0400 Subject: [PATCH 3/3] Save the file before committing --- src/startupscriptgenerator/src/node/scriptgenerator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/startupscriptgenerator/src/node/scriptgenerator.go b/src/startupscriptgenerator/src/node/scriptgenerator.go index ce649a09b4..94d1629035 100644 --- a/src/startupscriptgenerator/src/node/scriptgenerator.go +++ b/src/startupscriptgenerator/src/node/scriptgenerator.go @@ -207,8 +207,8 @@ func (gen *NodeStartupScriptGenerator) GenerateEntrypointScript() string { if gen.shouldApplicationInsightsBeConfigured() { loaderFile := filepath.Join(consts.NodeGlobalModulesPath, consts.NodeAppInsightsLoaderFileName) - var nodeOptions = "'--require " + loaderFile + " ' $NODE_OPTIONS" - scriptBuilder.WriteString("export NODE_OPTIONS=" + nodeOptions + "\n") + var nodeOptions = "' --require " + loaderFile + "'" + scriptBuilder.WriteString("export NODE_OPTIONS+=" + nodeOptions + "\n") } scriptBuilder.WriteString(startupCommand + "\n")