Merge pull request #18 from Azure-App-Service/dev

Dev -> Master
Azure-App-Service · Mar 8, 2019 · c6e024c · c6e024c
2 parents 012af88 + 004941f
commit c6e024c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Kudu.Core/AllSafeLinuxLock.cs b/Kudu.Core/AllSafeLinuxLock.cs
@@ -19,6 +19,7 @@ public class AllSafeLinuxLock :IOperationLock
     {
         private ITraceFactory _traceFactory;
         private static readonly string locksPath = "/home/site/locks";
+	private const int lockTimeout = 1200; //in seconds
         public AllSafeLinuxLock(string path, ITraceFactory traceFactory)
         {
             _traceFactory = traceFactory;
@@ -104,7 +105,7 @@ private static void CreateLockInfoFile(string operationName)
             lockInfo.heldByTID = Thread.CurrentThread.ManagedThreadId;
             lockInfo.heldByWorker = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
             lockInfo.heldByOp = operationName;
-            lockInfo.lockExpiry = DateTime.UtcNow.AddSeconds(600);
+            lockInfo.lockExpiry = DateTime.UtcNow.AddSeconds(lockTimeout);
             //Console.WriteLine("CreatingLockDir - LockInfoObj : "+lockInfo);
             var json = JsonConvert.SerializeObject(lockInfo);
             FileSystemHelpers.WriteAllText(locksPath+"/deployment/info.lock",json);
@@ -171,4 +172,4 @@ public override string ToString()
             }
         }
     }
-}
+}
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,6 +46,18 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
+                string virtualEnvName = "antenv";
+
+                if (version.StartsWith("3.6"))
+                {
+                    virtualEnvName = "antenv3.6";
+                }
+                else if (version.StartsWith("2.7"))
+                {
+                    virtualEnvName = "antenv2.7";
+                }
+
+                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)