Refactor WEBSITE_INSTANCE_ID (#56)

Azure-App-Service · Jun 14, 2019 · e188011 · e188011
1 parent 3e0f397
commit e188011
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Kudu.Core/AllSafeLinuxLock.cs b/Kudu.Core/AllSafeLinuxLock.cs
@@ -103,7 +103,7 @@ private static void CreateLockInfoFile(string operationName)
             var lockInfo = new LinuxLockInfo();
             lockInfo.heldByPID = Process.GetCurrentProcess().Id;
             lockInfo.heldByTID = Thread.CurrentThread.ManagedThreadId;
-            lockInfo.heldByWorker = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
+            lockInfo.heldByWorker = System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId);
             lockInfo.heldByOp = operationName;
             lockInfo.lockExpiry = DateTime.UtcNow.AddSeconds(lockTimeout);
             //Console.WriteLine("CreatingLockDir - LockInfoObj : "+lockInfo);

diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
@@ -399,7 +399,7 @@ public bool IsOnLinuxConsumption
 
         public static bool IsAzureEnvironment()
         {
-            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID"));
+            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId));
         }
 
         public static bool SkipSslValidation

diff --git a/Kudu.Core/Helpers/PostDeploymentHelper.cs b/Kudu.Core/Helpers/PostDeploymentHelper.cs
@@ -91,7 +91,7 @@ private static string WebSiteElasticScaleEnabled
         // WEBSITE_INSTANCE_ID not null or empty
         public static bool IsAzureEnvironment()
         {
-            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID"));
+            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId));
         }
 
         // WEBSITE_HOME_STAMPNAME = waws-prod-bay-001

diff --git a/Kudu.Core/Infrastructure/InstanceIdUtility.cs b/Kudu.Core/Infrastructure/InstanceIdUtility.cs
@@ -26,7 +26,7 @@ private static void EnsureInstanceId()
                 return;
             }
 
-            string instanceId = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
+            string instanceId = System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId);
             if (String.IsNullOrEmpty(instanceId))
             {
                 instanceId = System.Environment.MachineName;

diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -33,7 +33,7 @@
 </script>
 
 @{
-    var workerIdHash = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
+    var workerIdHash = System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId);
     var workerIdShortHash = workerIdHash?.Substring(0, 12);
     const string version = Constants.KuduBuild;
     var showLearningBanner = !deploymentManager.GetResults().Any();