From ef775058ddd2cac9699e91d13b6f283c17345e58 Mon Sep 17 00:00:00 2001 From: Alex Bochkov Date: Fri, 23 Dec 2016 14:40:08 -0800 Subject: [PATCH] ES --- EventLogLoaderManager/Form1.Designer.vb | 6 +++--- EventLogLoaderManager/Form1.vb | 7 +++++-- EventLogLoaderService/Service1.vb | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/EventLogLoaderManager/Form1.Designer.vb b/EventLogLoaderManager/Form1.Designer.vb index cf274f6..e6b074e 100644 --- a/EventLogLoaderManager/Form1.Designer.vb +++ b/EventLogLoaderManager/Form1.Designer.vb @@ -107,9 +107,9 @@ Partial Class Form1 Me.Label1.ForeColor = System.Drawing.Color.Maroon Me.Label1.Location = New System.Drawing.Point(8, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(507, 17) + Me.Label1.Size = New System.Drawing.Size(450, 17) Me.Label1.TabIndex = 3 - Me.Label1.Text = "Строка соединения с базой данных MS SQL для записи событий ЖР" + Me.Label1.Text = "Строка соединения с базой данных для записи событий ЖР" ' 'Button4 ' @@ -157,7 +157,7 @@ Partial Class Form1 'DBType ' Me.DBType.FormattingEnabled = True - Me.DBType.Items.AddRange(New Object() {"MS SQL Server", "MySQL"}) + Me.DBType.Items.AddRange(New Object() {"MS SQL Server", "MySQL", "ElasticSearch"}) Me.DBType.Location = New System.Drawing.Point(9, 29) Me.DBType.Name = "DBType" Me.DBType.Size = New System.Drawing.Size(112, 21) diff --git a/EventLogLoaderManager/Form1.vb b/EventLogLoaderManager/Form1.vb index 7144068..30bbacd 100644 --- a/EventLogLoaderManager/Form1.vb +++ b/EventLogLoaderManager/Form1.vb @@ -386,11 +386,15 @@ Public Class Form1 objConn.Open() Dim command As New MySqlCommand("SELECT 1", objConn) command.ExecuteReader() - Else + ElseIf DBType.Text = "MSSQL" Then Dim objConn As New SqlConnection(ConnectionStringBox.Text.Trim) objConn.Open() Dim command As New SqlCommand("SELECT 1", objConn) command.ExecuteReader() + ElseIf DBType.Text = "ElasticSearch" Then + + + End If MsgBox("Подключение выполнено успешно!", , Text) @@ -493,5 +497,4 @@ Public Class Form1 End Sub - End Class diff --git a/EventLogLoaderService/Service1.vb b/EventLogLoaderService/Service1.vb index 02ca5d5..d16d5f6 100644 --- a/EventLogLoaderService/Service1.vb +++ b/EventLogLoaderService/Service1.vb @@ -519,8 +519,9 @@ Public Class EventLogLoaderService Public LastEventNumber83 As Integer = 0 Public ConnectionString As String - Public ItIsMSSQL As String - Public ItIsMySQL As String + Public ItIsMSSQL As Boolean + Public ItIsMySQL As Boolean + Public ItIsES As Boolean Sub CreateStr(ByRef Str As String, LastLvl As Integer, Arr() As Object)