Fix up WEBSITE_SITE_NAME is it has underscores. Fixes projectkudu#1390

jamesche75 · Nov 14, 2014 · 69aea50 · 69aea50
1 parent 817b527
commit 69aea50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Kudu.Core/Deployment/DeploymentStatusFile.cs b/Kudu.Core/Deployment/DeploymentStatusFile.cs
@@ -202,8 +202,7 @@ private static string GetOptionalElementValue(XElement element, string localName
         private static string GetSiteName(IEnvironment environment)
         {
             // Try to get the site name from the environment (WAWS will set it)
-            string siteName = System.Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME");
-
+            string siteName = ServerConfiguration.GetApplicationName();
             if (String.IsNullOrEmpty(siteName))
             {
                 // Otherwise get it from the root directory name

diff --git a/Kudu.Core/Infrastructure/ServerConfiguration.cs b/Kudu.Core/Infrastructure/ServerConfiguration.cs
@@ -30,11 +30,19 @@ public string GitServerRoot
             }
         }
 
-        static private string GetApplicationName()
+        public static string GetApplicationName()
         {
             var applicationName = System.Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME");
             if(!string.IsNullOrEmpty(applicationName))
             {
+                // Yank everything after the first underscore to work around
+                // a slot issue where WEBSITE_SITE_NAME gets set incorrectly
+                int underscoreIndex = applicationName.IndexOf('_');
+                if (underscoreIndex > 0)
+                {
+                    applicationName = applicationName.Substring(0, underscoreIndex);
+                }
+
                 return applicationName;
             }