#1955378: [Test] NPE when start streaming log for an un-deployed function app

wangmingliang-ms · wangmingliang-ms · commit 6995bc78bce0 · 2022-05-30T17:41:02.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/functionapp/logstreaming/FunctionAppLogStreamingHandler.java b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/functionapp/logstreaming/FunctionAppLogStreamingHandler.java
@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -97,7 +98,8 @@ private static String getApplicationInsightLiveMetricsUrl(ApplicationInsight tar
     }
 
     private static boolean isLogStreamingEnabled(FunctionAppBase<?, ?, ?> functionApp) {
-        return functionApp.getRuntime().getOperatingSystem() == OperatingSystem.LINUX || functionApp.getDiagnosticConfig().isEnableApplicationLog();
+        return functionApp.getRuntime().getOperatingSystem() == OperatingSystem.LINUX || 
+                Optional.ofNullable(functionApp.getDiagnosticConfig()).map(DiagnosticConfig::isEnableWebServerLogging).orElse(false);
     }
 
     private static void enableLogStreaming(FunctionAppBase<?, ?, ?> functionApp) {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import java.io.IOException;`
`9`	`9`	`import java.io.UnsupportedEncodingException;`
`10`	`10`	`import java.net.URLEncoder;`
	`11`	`+import java.util.Optional;`
`11`	`12`
`12`	`13`	`import org.apache.commons.lang3.StringUtils;`
`13`	`14`
`@@ -97,7 +98,8 @@ private static String getApplicationInsightLiveMetricsUrl(ApplicationInsight tar`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`private static boolean isLogStreamingEnabled(FunctionAppBase<?, ?, ?> functionApp) {`
`100`		`- return functionApp.getRuntime().getOperatingSystem() == OperatingSystem.LINUX \|\| functionApp.getDiagnosticConfig().isEnableApplicationLog();`
	`101`	`+ return functionApp.getRuntime().getOperatingSystem() == OperatingSystem.LINUX \|\|`
	`102`	`+ Optional.ofNullable(functionApp.getDiagnosticConfig()).map(DiagnosticConfig::isEnableWebServerLogging).orElse(false);`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`private static void enableLogStreaming(FunctionAppBase<?, ?, ?> functionApp) {`