Merge pull request #470 from ONLYOFFICE/bugfix/69620

fix bug 69620
ONLYOFFICE · Aug 13, 2024 · 6115069 · 6115069
2 parents 1dbfb23 + 9d0a042
commit 6115069
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/products/ASC.Files/Core/Helpers/DocumentService.cs b/products/ASC.Files/Core/Helpers/DocumentService.cs
@@ -29,21 +29,10 @@
 
 namespace ASC.Files.Core.Helpers;
 
-/// <summary>
-/// Class service connector
-/// </summary>
 public static class DocumentService
 {
-    /// <summary>
-    /// Timeout to request conversion
-    /// </summary>
-    public static readonly int Timeout = 120000;
-    //public static int Timeout = Convert.ToInt32(ConfigurationManagerExtension.AppSettings["files.docservice.timeout"] ?? "120000");
-
-    /// <summary>
-    /// Number of tries request conversion
-    /// </summary>
-    public static readonly int MaxTry = 3;
+    private const int Timeout = 120000;
+
 
     private static readonly JsonSerializerOptions _bodySettings = new()
     {
@@ -246,8 +235,7 @@ public static async Task<CommandResponse> CommandRequestAsync(FileUtility fileUt
             Method = HttpMethod.Post
         };
 
-        var httpClient = clientFactory.CreateClient();
-        httpClient.Timeout = TimeSpan.FromMilliseconds(commandTimeout);
+        var httpClient = clientFactory.CreateClient(nameof(DocumentService));
 
         var body = new CommandBody
         {
@@ -284,12 +272,20 @@ public static async Task<CommandResponse> CommandRequestAsync(FileUtility fileUt
         var bodyString = JsonSerializer.Serialize(body, _bodySettings);
 
         request.Content = new StringContent(bodyString, Encoding.UTF8, "application/json");
-
         string dataResponse;
-        using (var response = await httpClient.SendAsync(request, cancellationTokenSource.Token))
+        try
         {
+            using var response = await httpClient.SendAsync(request, cancellationTokenSource.Token);
             dataResponse = await response.Content.ReadAsStringAsync(cancellationTokenSource.Token);
         }
+        catch (HttpRequestException e) when (e.HttpRequestError == HttpRequestError.NameResolutionError)
+        {
+            return new CommandResponse
+            {
+                Error = ErrorTypes.UnknownError,
+                ErrorString = e.Message
+            };
+        }
 
         try
         {
@@ -340,8 +336,7 @@ public static async Task<CommandResponse> CommandRequestAsync(FileUtility fileUt
             Method = HttpMethod.Post
         };
 
-        var httpClient = clientFactory.CreateClient();
-        httpClient.Timeout = TimeSpan.FromMilliseconds(Timeout);
+        var httpClient = clientFactory.CreateClient(nameof(DocumentService));
 
         var body = new BuilderBody
         {
@@ -722,19 +717,17 @@ private static (int ResultPercent, string responseuri, string convertedFileType)
 
 public static class DocumentServiceHttpClientExtension
 {
-    public static void AddDocumentServiceHttpClient(this IServiceCollection services)
+    public static void AddDocumentServiceHttpClient(this IServiceCollection services, IConfiguration configuration)
     {
+
         services.AddHttpClient(nameof(DocumentService))
-            .SetHandlerLifetime(TimeSpan.FromMilliseconds(DocumentService.Timeout))
+            .SetHandlerLifetime(TimeSpan.FromMilliseconds(Convert.ToInt32(configuration["files:docservice:timeout"] ?? "5000")))
             .AddPolicyHandler((_, _) => 
                 HttpPolicyExtensions
-                .HandleTransientHttpError()
-                .OrResult(response =>
-                {
-                    return response.IsSuccessStatusCode
-                        ? false
-                        : throw new HttpRequestException($"Response status code: {response.StatusCode}", null, response.StatusCode);
-                })
-                .WaitAndRetryAsync(MaxTry, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))));
+                .HandleTransientHttpError() 
+                .OrResult(response => response.IsSuccessStatusCode
+                    ? false
+                    : throw new HttpRequestException($"Response status code: {response.StatusCode}", null, response.StatusCode))
+                .WaitAndRetryAsync(Convert.ToInt32(configuration["files:docservice:try"] ?? "3"), retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))));
     }
 }
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
@@ -56,7 +56,7 @@ public override async Task ConfigureServices(IServiceCollection services)
         services.AddBaseDbContextPool<FilesDbContext>();
         services.RegisterQuotaFeature();
         services.AddScoped<IWebItem, ProductEntryPoint>();
-        services.AddDocumentServiceHttpClient();
+        services.AddDocumentServiceHttpClient(_configuration);
 
         services.AddStartupTask<CheckPdfStartupTask>()
            .TryAddSingleton(services);

diff --git a/products/ASC.Files/Service/Startup.cs b/products/ASC.Files/Service/Startup.cs
@@ -74,6 +74,6 @@ public override async Task ConfigureServices(IServiceCollection services)
         services.AddSingleton(Channel.CreateUnbounded<FileData<int>>());
         services.AddSingleton(svc => svc.GetRequiredService<Channel<FileData<int>>>().Reader);
         services.AddSingleton(svc => svc.GetRequiredService<Channel<FileData<int>>>().Writer);
-        services.AddDocumentServiceHttpClient();
+        services.AddDocumentServiceHttpClient(Configuration);
     }
 }
diff --git a/web/ASC.Web.Api/Startup.cs b/web/ASC.Web.Api/Startup.cs
@@ -57,6 +57,7 @@ public override async Task ConfigureServices(IServiceCollection services)
                    .TryAddSingleton(services);
 
         services.AddActivePassiveHostedService<NotifySchedulerService>(_configuration, "WebApiNotifySchedulerService");
+        services.AddDocumentServiceHttpClient(_configuration);
     }
 
     public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)