fix close external clients

This commit is contained in:
Alex Bezdieniezhnykh
2025-03-24 11:48:26 +02:00
parent 73c2ab5374
commit e0c88bd8fb
4 changed files with 9 additions and 4 deletions
+1
View File
@@ -395,6 +395,7 @@ public partial class Annotator
MainCancellationSource.Cancel(); MainCancellationSource.Cancel();
_inferenceService.StopInference(); _inferenceService.StopInference();
DetectionCancellationSource.Cancel(); DetectionCancellationSource.Cancel();
_mediaPlayer.Stop(); _mediaPlayer.Stop();
_mediaPlayer.Dispose(); _mediaPlayer.Dispose();
_libVLC.Dispose(); _libVLC.Dispose();
@@ -54,7 +54,7 @@ public abstract class BaseZeroMqExternalClient : IExternalClient
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine(e); Console.WriteLine(e);
throw; //throw;
} }
_dealer.Options.Identity = Encoding.UTF8.GetBytes(_clientId.ToString("N")); _dealer.Options.Identity = Encoding.UTF8.GetBytes(_clientId.ToString("N"));
+4 -2
View File
@@ -8,6 +8,7 @@ using Azaion.Common.DTO;
using Azaion.Common.DTO.Config; using Azaion.Common.DTO.Config;
using Azaion.Common.Extensions; using Azaion.Common.Extensions;
using Azaion.Common.Services; using Azaion.Common.Services;
using Azaion.CommonSecurity;
using Azaion.CommonSecurity.Services; using Azaion.CommonSecurity.Services;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@@ -35,7 +36,8 @@ public partial class MainSuite
IGalleryService galleryService, IGalleryService galleryService,
IDbFactory dbFactory, IDbFactory dbFactory,
IResourceLoader resourceLoader, IResourceLoader resourceLoader,
IEnumerable<IExternalClient> externalClients) [FromKeyedServices(SecurityConstants.EXTERNAL_INFERENCE_PATH)] IExternalClient inferenceClient,
[FromKeyedServices(SecurityConstants.EXTERNAL_GPS_DENIED_PATH)] IExternalClient gpsClient)
{ {
_configUpdater = configUpdater; _configUpdater = configUpdater;
_modules = modules; _modules = modules;
@@ -43,7 +45,7 @@ public partial class MainSuite
_galleryService = galleryService; _galleryService = galleryService;
_dbFactory = dbFactory; _dbFactory = dbFactory;
_resourceLoader = resourceLoader; _resourceLoader = resourceLoader;
_externalClients = externalClients; _externalClients = [inferenceClient, gpsClient];
_appConfig = appConfig.Value; _appConfig = appConfig.Value;
InitializeComponent(); InitializeComponent();
Loaded += OnLoaded; Loaded += OnLoaded;
+3 -1
View File
@@ -50,7 +50,9 @@
"TrackingDistanceConfidence": 0.15, "TrackingDistanceConfidence": 0.15,
"TrackingProbabilityIncrease": 15.0, "TrackingProbabilityIncrease": 15.0,
"TrackingIntersectionThreshold": 0.8 "TrackingIntersectionThreshold": 0.8,
"ModelBatchSize": 2
}, },
"ThumbnailConfig": { "Size": "240,135", "Border": 10 } "ThumbnailConfig": { "Size": "240,135", "Border": 10 }
} }