haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to prevent premature timeouts when running with Mono

Browse Source
This commit is contained in:
Kenneth Skovhede
2014-07-20 10:07:56 +02:00
parent c85be90a96
commit eb2454f4e0
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Backend/S3/S3Wrapper.cs
+15 -6
View File
@@ -71,12 +71,17 @@ namespace Duplicati.Library.Backend
GetObjectRequest objectGetRequest = new GetObjectRequest();
objectGetRequest.BucketName = bucketName;
objectGetRequest.Key = keyName;
objectGetRequest.Timeout = System.Threading.Timeout.Infinite;
objectGetRequest.ReadWriteTimeout = (int)TimeSpan.FromMinutes(1).TotalMilliseconds;
objectGetRequest.Timeout = (int)TimeSpan.FromMinutes(5).TotalMilliseconds;
objectGetRequest.ReadWriteTimeout = System.Threading.Timeout.Infinite;
using (GetObjectResponse objectGetResponse = m_client.GetObject(objectGetRequest))
using (System.IO.Stream s = objectGetResponse.ResponseStream)
using(GetObjectResponse objectGetResponse = m_client.GetObject(objectGetRequest))
using(System.IO.Stream s = objectGetResponse.ResponseStream)
{
try { s.ReadTimeout = (int)TimeSpan.FromMinutes(1).TotalMilliseconds; }
catch { }
Utility.Utility.CopyStream(s, target);
}
}
public void GetFileObject(string bucketName, string keyName, string localfile)
@@ -99,8 +104,12 @@ namespace Duplicati.Library.Backend
objectAddRequest.InputStream = source;
objectAddRequest.StorageClass = m_useRRS ? S3StorageClass.ReducedRedundancy : S3StorageClass.Standard;
objectAddRequest.GenerateMD5Digest = false; //We would like this, but cannot read the stream twice :(
objectAddRequest.Timeout = System.Threading.Timeout.Infinite;
objectAddRequest.ReadWriteTimeout = (int)TimeSpan.FromMinutes(1).TotalMilliseconds;
if (!Library.Utility.Utility.IsMono)
{
objectAddRequest.Timeout = System.Threading.Timeout.Infinite;
objectAddRequest.ReadWriteTimeout = (int)TimeSpan.FromMinutes(1).TotalMilliseconds;
}
using (PutObjectResponse objectAddResponse = m_client.PutObject(objectAddRequest))
{ }