1c/YY.EventLogExportAssistant
1
0
Fork 0
mirror of https://github.com/krugersu/YY.EventLogExportAssistant.git synced 2026-06-20 01:16:51 +02:00
Code Issues Releases Activity

Merge pull request #30 from YPermitin/develop

Browse Source 
Небольшие улучшения
This commit is contained in:
Permitin Yury
2020-11-15 17:23:08 +05:00
committed by GitHub
parent fb89370877 2146be0334
commit 94238da834
14 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+3 -2
View File
@@ -1,11 +1,10 @@
language: csharp
mono: none
dist: xenial
dist: bionic
dotnet: 3.1
services:
- postgresql
- mysql
- clickhouse
addons:
postgresql: "10"
before_install:
@@ -16,6 +15,7 @@ before_install:
- echo -e '-XX:+DisableExplicitGC\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dlog4j.skipJansi=true\n-server\n' | sudo tee -a /etc/elasticsearch/jvm.options
- sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
- sudo systemctl start elasticsearch
- sudo chmod +x ./Scripts/travisci-install-clickhouse.sh && ./Scripts/travisci-install-clickhouse.sh
install:
- dotnet restore
before_script:
@@ -33,6 +33,7 @@ script:
- dotnet test Tests/YY.EventLogExportAssistant.PostgreSQL.Tests/YY.EventLogExportAssistant.PostgreSQL.Tests.csproj
- dotnet test Tests/YY.EventLogExportAssistant.ElasticSearch.Tests/YY.EventLogExportAssistant.ElasticSearch.Tests.csproj
- dotnet test Tests/YY.EventLogExportAssistant.MySQL.Tests/YY.EventLogExportAssistant.MySQL.Tests.csproj
#- dotnet test Tests/YY.EventLogExportAssistant.ClickHouse.Tests/YY.EventLogExportAssistant.ClickHouse.Tests.csproj
deploy:
skip_cleanup: true
provider: script
Libs/YY.EventLogExportAssistant.ClickHouse/ClickHouseContext.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace YY.EventLogExportAssistant.ClickHouse
i.ConnectId ?? 0,
i.Session ?? 0,
TransactionStatuses.GetPresentationByName(i.TransactionStatus.ToString()),
i.TransactionDate ?? DateTime.MinValue,
i.TransactionDate ?? new DateTime(1970,1,1),
i.TransactionId ?? 0,
i.User?.Name ?? string.Empty,
i.User?.Uuid.ToString() ?? _emptyGuidAsString,
Libs/YY.EventLogExportAssistant.ClickHouse/Helpers/ClickHouseHelpers.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace YY.EventLogExportAssistant.ClickHouse.Helpers
}
}
}
public static void DropDatabaseIfNotExist(string connectionSettings)
public static void DropDatabaseIfExist(string connectionSettings)
{
var connectionParams = GetConnectionParams(connectionSettings);
var databaseParam = connectionParams.FirstOrDefault(e => e.Key.ToUpper() == "DATABASE");
Libs/YY.EventLogExportAssistant.ClickHouse/YY.EventLogExportAssistant.ClickHouse.csproj
+2 -2
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.0.0.2</Version>
<Version>1.0.0.3</Version>
<Authors>Permitin Yuriy</Authors>
<Company>Permitin YuriyPermitin Yuriy</Company>
<Product>Event log export assistant to ClickHouse</Product>
@@ -15,7 +15,7 @@
<RepositoryType>GIT</RepositoryType>
<PackageTags>event, log, 1C, enterprise, export, elasticsearch, elk</PackageTags>
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
<AssemblyVersion>1.0.0.2</AssemblyVersion>
<AssemblyVersion>1.0.0.3</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
Libs/YY.EventLogExportAssistant.Core/YY.EventLogExportAssistant.Core.csproj
+3 -3
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>YY.EventLogExportAssistant</RootNamespace>
<Version>1.0.0.33</Version>
<Version>1.0.0.34</Version>
<PackageId>YY.EventLogExportAssistant.Core</PackageId>
<Authors>Permitin Yuriy</Authors>
<Company />
@@ -17,7 +17,7 @@
<RepositoryUrl>https://github.com/YPermitin/YY.EventLogExportAssistant</RepositoryUrl>
<RepositoryType>GIT</RepositoryType>
<PackageTags>event, log, 1C, enterprise, export</PackageTags>
<AssemblyVersion>1.0.0.33</AssemblyVersion>
<AssemblyVersion>1.0.0.34</AssemblyVersion>
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
</PropertyGroup>
@@ -25,7 +25,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="YY.EventLogReaderAssistant" Version="1.0.0.37" />
<PackageReference Include="YY.EventLogReaderAssistant" Version="1.0.0.40" />
</ItemGroup>
<ItemGroup>
Libs/YY.EventLogExportAssistant.ElasticSearch/YY.EventLogExportAssistant.ElasticSearch.csproj
+2 -2
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>1.0.0.15</Version>
<Version>1.0.0.16</Version>
<Company>Permitin Yuriy</Company>
<Authors>Permitin Yuriy</Authors>
<Product>Event log export assistant to ElasticSearch</Product>
@@ -15,7 +15,7 @@
<PackageTags>event, log, 1C, enterprise, export, elasticsearch, elk</PackageTags>
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyVersion>1.0.0.15</AssemblyVersion>
<AssemblyVersion>1.0.0.16</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
Libs/YY.EventLogExportAssistant.MySQL/YY.EventLogExportAssistant.MySQL.csproj
+2 -2
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>1.0.0.12</Version>
<Version>1.0.0.13</Version>
<Authors>Permitin Yuriy</Authors>
<Product>Event log export assistant for MySQL</Product>
<Description>Library for exprorting 1C:Enterprise 8.x platform's event log files to MySQL database</Description>
@@ -14,7 +14,7 @@
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
<PackageIcon>icon.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyVersion>1.0.0.12</AssemblyVersion>
<AssemblyVersion>1.0.0.13</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
Libs/YY.EventLogExportAssistant.PostgreSQL/YY.EventLogExportAssistant.PostgreSQL.csproj
+3 -3
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>1.0.0.33</Version>
<Version>1.0.0.34</Version>
<PackageId>YY.EventLogExportAssistant.PostgreSQL</PackageId>
<Authors>Permitin Yuriy</Authors>
<Product>Event log export assistant for PostgreSQL</Product>
@@ -14,9 +14,9 @@
<RepositoryType>GIT</RepositoryType>
<PackageTags>event, log, 1C, enterprise, export, postgres, postgresql</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyVersion>1.0.0.33</AssemblyVersion>
<AssemblyVersion>1.0.0.34</AssemblyVersion>
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
<FileVersion>1.0.0.33</FileVersion>
<FileVersion>1.0.0.34</FileVersion>
</PropertyGroup>
<ItemGroup>
Libs/YY.EventLogExportAssistant.SQLServer/YY.EventLogExportAssistant.SQLServer.csproj
+3 -3
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>1.0.0.33</Version>
<Version>1.0.0.34</Version>
<PackageId>YY.EventLogExportAssistant.SQLServer</PackageId>
<Authors>Permitin Yuriy</Authors>
<Company />
@@ -15,8 +15,8 @@
<RepositoryUrl>https://github.com/YPermitin/YY.EventLogExportAssistant</RepositoryUrl>
<RepositoryType>GIT</RepositoryType>
<PackageTags>event, log, 1C, enterprise, export, sqlserver</PackageTags>
<AssemblyVersion>1.0.0.33</AssemblyVersion>
<FileVersion>1.0.0.33</FileVersion>
<AssemblyVersion>1.0.0.34</AssemblyVersion>
<FileVersion>1.0.0.34</FileVersion>
<PackageReleaseNotes>Just beginning...</PackageReleaseNotes>
</PropertyGroup>
Scripts/deploy.sh
+1 -1
View File
@@ -6,4 +6,4 @@ dotnet nuget push ./Libs/YY.EventLogExportAssistant.SQLServer/bin/Release/YY.Eve
dotnet nuget push ./Libs/YY.EventLogExportAssistant.PostgreSQL/bin/Release/YY.EventLogExportAssistant.PostgreSQL.*.nupkg -k $1 -s https://api.nuget.org/v3/index.json --skip-duplicate
dotnet nuget push ./Libs/YY.EventLogExportAssistant.ElasticSearch/bin/Release/YY.EventLogExportAssistant.ElasticSearch.*.nupkg -k $1 -s https://api.nuget.org/v3/index.json --skip-duplicate
dotnet nuget push ./Libs/YY.EventLogExportAssistant.MySQL/bin/Release/YY.EventLogExportAssistant.MySQL.*.nupkg -k $1 -s https://api.nuget.org/v3/index.json --skip-duplicate
dotnet nuget push ./Libs/YY.EventLogExportAssistant.ClickHouse/bin/Release/YY.EventLogExportAssistant.ClickHouse.*.nupkg -k $1 -s https://api.nuget.org/v3/index.json --skip-duplicate
#dotnet nuget push ./Libs/YY.EventLogExportAssistant.ClickHouse/bin/Release/YY.EventLogExportAssistant.ClickHouse.*.nupkg -k $1 -s https://api.nuget.org/v3/index.json --skip-duplicate
Scripts/travisci-install-clickhouse.sh
+20
View File
@@ -0,0 +1,20 @@
#!/bin/sh
sudo apt-get install apt-transport-https ca-certificates dirmngr
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E0C56BD4
echo "deb https://repo.clickhouse.tech/deb/stable/ main/" | sudo tee \
/etc/apt/sources.list.d/clickhouse.list
sudo apt-get update
sudo apt-get install -y clickhouse-server clickhouse-client
sudo sed -i 's/<!-- <listen_host>0.0.0.0<\/listen_host> -->/<listen_host>0.0.0.0<\/listen_host>/g' /etc/clickhouse-server/config.xml
sudo sed -i 's/<password><\/password>/<password>defaultpassword<\/password>/g' /etc/clickhouse-server/users.xml
sudo service clickhouse-server start
sleep 30
clickhouse-client --query "SELECT 'Connection OK'" --password defaultpassword
clickhouse-client --query "SELECT version()" --password defaultpassword
Tests/YY.EventLogExportAssistant.ClickHouse.Tests/EventLogExportMasterTests.cs
+13 -12
View File
@@ -54,7 +54,7 @@ namespace YY.EventLogExportAssistant.ClickHouse.Tests
private void ExportToClickHouse(EventLogExportSettings eventLogSettings)
{
ClickHouseHelpers.DropDatabaseIfNotExist(_settings.ConnectionString);
ClickHouseHelpers.DropDatabaseIfExist(_settings.ConnectionString);
EventLogOnClickHouse target = new EventLogOnClickHouse(_settings.ConnectionString, eventLogSettings.Portion);
target.SetInformationSystem(new InformationSystemsBase()
@@ -112,17 +112,18 @@ namespace YY.EventLogExportAssistant.ClickHouse.Tests
.AddJsonFile(configFilePath, optional: true, reloadOnChange: true)
.Build();
string connectionString = Configuration.GetConnectionString("EventLogDatabase");
try
{
using (var context = new ClickHouseContext(connectionString))
{
var someValue = context.GetHashCode();
}
}
catch
{
configFilePath = "appveyor-appsettings.json";
}
// Äëÿ AppVeyor òåñò ïîêà íå çàïóñêàåì
//try
//{
// using (var context = new ClickHouseContext(connectionString))
// {
// var someValue = context.GetHashCode();
// }
//}
//catch
//{
// configFilePath = "appveyor-appsettings.json";
//}
}
if (!File.Exists(configFilePath))
Tests/YY.EventLogExportAssistant.ClickHouse.Tests/travisci-appsettings.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"ConnectionStrings": {
"EventLogDatabase": "Host=localhost;Port=5432;Database=EventLogExportTest;Username=default;Password="
"EventLogDatabase": "Host=127.0.0.1;Port=5432;Database=EventLogExportTest;Username=default;password=defaultpassword;"
},
"LGF": {
"InformationSystem": {
YY.EventLogExportAssistant.sln
+2 -1
View File
@@ -51,6 +51,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{AF6C
Scripts\MySQL. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\MySQL. Скрипт создания базы для хранения данных журнала регистрации.sql
Scripts\PostgreSQL. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\PostgreSQL. Скрипт создания базы для хранения данных журнала регистрации.sql
Scripts\SQL Server. Скрипт создания базы для хранения данных журнала регистрации.sql = Scripts\SQL Server. Скрипт создания базы для хранения данных журнала регистрации.sql
Scripts\travisci-install-clickhouse.sh = Scripts\travisci-install-clickhouse.sh
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{9C060815-539F-46E8-83AD-89F573568BC5}"
@@ -87,7 +88,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YY.EventLogExportAssistant.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YY.EventLogExportToClickHouse", "Apps\YY.EventLogExportToClickHouse\YY.EventLogExportToClickHouse.csproj", "{922D62B9-D5A7-4806-B2BC-D7C9631B7939}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YY.EventLogExportAssistant.ClickHouse.Tests", "Tests\YY.EventLogExportAssistant.ClickHouse.Tests\YY.EventLogExportAssistant.ClickHouse.Tests.csproj", "{F958CA9D-F065-4955-AAF2-E76CAB1712AE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YY.EventLogExportAssistant.ClickHouse.Tests", "Tests\YY.EventLogExportAssistant.ClickHouse.Tests\YY.EventLogExportAssistant.ClickHouse.Tests.csproj", "{F958CA9D-F065-4955-AAF2-E76CAB1712AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution