diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzer.csproj b/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzer.csproj index 29101a947..3b5760d95 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzer.csproj +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzer.csproj @@ -16,6 +16,7 @@ + diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs index 3dfb4e76d..d40e3f472 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs @@ -1,59 +1,56 @@ using BCG; -using bts; -using bts.api.core; +using Bts.DataStream.Services; +using Bts.DataStreamCore.Services; +using Bts.Extensions.Hosting; +using Bts.PubSub.Services; -using Bts.DataStreamQueryAnalyzer; -using Bts.PubSub; - -using CommandLine; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Spark.Api.Services; using Spark.Core.Services; using System; +using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; static class Program { - [STAThread] - static async Task Main(string[] args) { - await Parser.Default.ParseArguments(args) - .MapResult(RunAsync, errs => Task.FromResult(1)); - - async Task RunAsync(DataStreamQueryAnalyzerConfig cfg) { - try { - cfg.MergeWithConfigFile(); - cfg.MergeWith(DataStreamQueryAnalyzerConfig.Default()); - PubSubConfig.SetGlobalConfig(Log.notnull(cfg.PubSub)); - var configLoader = new SparkConfigLoader(new SparkConfigLoaderOpts() { ConfigServer = cfg.Sparkd }); - var serviceContext = new ServiceContext(configLoader); - var credentials = new SparkApiCredentials() { - User = cfg.User, - Password = cfg.Password - }; - var loginService = new SparkdLoginService(serviceContext, credentials, configLoader); - var permissions = new UserDataPermissions(loginService); - var mdClientConfig = new MarketDataClientConfig() { HotPollInterval = TimeSpan.FromSeconds(0.5) }; - var mdClient = new MarketDataClient(configLoader, loginService, permissions, mdClientConfig); - PrimitiveManager.SetMarketDataClient(mdClient); - using var vsd = new ViewStreamDatabase(new SubscriberCoreFactory()); - ViewStreamDatabase.SetGlobalInstance(new ViewStreamDatabase(new SubscriberCoreFactory())); - Log.Gen.info("Starting DataStreamQueryAnalyzer"); - var mainForm = new MainForm(); - if (cfg.StreamFile is not null) { - mainForm.loadFile(cfg.StreamFile); - } - Application.Run(mainForm); - } catch (Exception ex) { - // Write the error to console first, in case the logging system is compromised. - var error_msg = $"DataStreamPublisher threw exception:\n{ex}"; - Console.Error.WriteLine(error_msg); - Console.Error.Flush(); - bts.Log.Gen.error(error_msg); - return 1; - } - return 0; + static async Task Main(string[] args) { + Console.Write("Starting DataStreamQueryAnalyzer"); + int exitCode = 0; + IHost? host = null; + try { + host = HostBuilderExtensions.CreateBtsBuilder(args) + .ConfigureServices(ConfigureServices) + .Build(); + await host.StartAsync(); + var winFormsThread = new Thread(RunWinFormsApp); + winFormsThread.SetApartmentState(ApartmentState.STA); + winFormsThread.Start(); + winFormsThread.Join(); + } catch (Exception ex) { + Console.Error.Write($"DataStreamQueryAnalyzer crashed: {ex}"); + exitCode = 1; } + if (host is not null) { + await host.StopAsync(); + } + return exitCode; } + + static void RunWinFormsApp() { + var win = new MainForm(); + Application.Run(win); + } + + static void ConfigureServices(HostBuilderContext context, IServiceCollection services) => + services.AddSpark(context.Configuration.GetSection("Spark")) + .AddSparkApi(context.Configuration.GetSection("SparkApi")) + .AddMasterWorker(context.Configuration.GetSection("MasterWorker")) + .AddViewStreamDatabase() + .AddPubSubClient(context.Configuration.GetSection("PubSub")) + .AddPubTableBroker() + .AddRemoteQueryManager(); }