microsoft
/
Recurring-Integrations-Scheduler
зеркало из https://github.com/microsoft/Recurring-Integrations-Scheduler.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updated packages 

Fixed error keys file functionality for files with package templates
This commit is contained in:
Tomek Melissa 2019-04-01 21:45:35 +02:00
Родитель 91cc7d0ed1
Коммит e891cab497
22 изменённых файлов: 85 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Common/Common.csproj
Просмотреть файл

@ -88,7 +88,7 @@
<Version>12.0.1</Version>
</PackageReference>
<PackageReference Include="Polly">
<Version>7.0.3</Version>
<Version>7.1.0</Version>
</PackageReference>
<PackageReference Include="Quartz">
<Version>3.0.7</Version>

10
Common/JobSettings/ExecutionJobSettings.cs
Просмотреть файл

@ -86,6 +86,8 @@ namespace RecurringIntegrationsScheduler.Common.JobSettings
}
GetImportTargetErrorKeysFile = Convert.ToBoolean(dataMap.GetString(SettingsConstants.GetImportTargetErrorKeysFile));
PackageTemplate = dataMap.GetString(SettingsConstants.PackageTemplate);
}
#region Members
@ -130,6 +132,14 @@ namespace RecurringIntegrationsScheduler.Common.JobSettings
/// </value>
public bool GetImportTargetErrorKeysFile { get; private set; }
/// <summary>
/// Package template location.
/// </summary>
/// <value>
/// Package template location.
/// </value>
public string PackageTemplate { get; private set; }
#endregion
}
}

2
Job.Download/Job.Download.csproj
Просмотреть файл

@ -43,7 +43,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.7.0.3\lib\netstandard2.0\Polly.dll</HintPath>
<HintPath>..\packages\Polly.7.1.0\lib\netstandard2.0\Polly.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>

2
Job.Download/packages.config
Просмотреть файл

@ -2,6 +2,6 @@
<packages>
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
<package id="Polly" version="7.0.3" targetFramework="net472" />
<package id="Polly" version="7.1.0" targetFramework="net472" />
<package id="Quartz" version="3.0.7" targetFramework="net461" />
</packages>

21
Job.ExecutionMonitor/ExecutionMonitor.cs
Просмотреть файл

@ -192,8 +192,6 @@ namespace RecurringIntegrationsScheduler.Job
// If status was found and is not null,
if (jobStatusDetail != null)
await PostProcessMessage(jobStatusDetail, dataMessage);
System.Threading.Thread.Sleep(_settings.Interval);
}
}
@ -228,9 +226,22 @@ namespace RecurringIntegrationsScheduler.Job
await CreateLinkToExecutionSummaryPage(dataMessage.MessageId, processingErrorDestination);
if (_settings.GetImportTargetErrorKeysFile)
{
var entitiesInPackage = GetEntitiesNamesInPackage(processingErrorDestination);
if (Log.IsDebugEnabled)
{
Log.DebugFormat(CultureInfo.InvariantCulture, string.Format(Resources.Job_0_Checking_if_error_keys_file_was_generated, _context.JobDetail.Key));
}
var fileWithManifest = processingErrorDestination;
if(!string.IsNullOrEmpty(_settings.PackageTemplate))
{
fileWithManifest = _settings.PackageTemplate;
}
var entitiesInPackage = GetEntitiesNamesInPackage(fileWithManifest);
foreach(var entity in entitiesInPackage)
{
if (Log.IsDebugEnabled)
{
Log.DebugFormat(CultureInfo.InvariantCulture, string.Format(Resources.Job_0_Checking_for_error_keys_for_data_entity_1, _context.JobDetail.Key, entity));
}
var errorsExist = await _httpClientHelper.GenerateImportTargetErrorKeysFile(dataMessage.MessageId, entity);
if (errorsExist)
{
@ -295,6 +306,10 @@ namespace RecurringIntegrationsScheduler.Job
private List<string> GetEntitiesNamesInPackage(string fileName)
{
var manifestPath = "";
if (Log.IsDebugEnabled)
{
Log.DebugFormat(CultureInfo.InvariantCulture, string.Format(Resources.Job_0_Looking_for_data_entities_in_manifest_file_1, _context.JobDetail.Key, fileName));
}
using (var package = ZipFile.OpenRead(fileName))
{
foreach (var entry in package.Entries)

2
Job.ExecutionMonitor/Job.ExecutionMonitor.csproj
Просмотреть файл

@ -43,7 +43,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.7.0.3\lib\netstandard2.0\Polly.dll</HintPath>
<HintPath>..\packages\Polly.7.1.0\lib\netstandard2.0\Polly.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>

27
Job.ExecutionMonitor/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -69,6 +69,24 @@ namespace RecurringIntegrationsScheduler.Job.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Job: {0}. Checking for error keys file for data entity {1}..
/// </summary>
internal static string Job_0_Checking_for_error_keys_for_data_entity_1 {
get {
return ResourceManager.GetString("Job_0_Checking_for_error_keys_for_data_entity_1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Job: {0}. Checking if error keys file was generated..
/// </summary>
internal static string Job_0_Checking_if_error_keys_file_was_generated {
get {
return ResourceManager.GetString("Job_0_Checking_if_error_keys_file_was_generated", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Job: {0} Download of error keys file failed. Exception : {1}.
/// </summary>
@ -150,6 +168,15 @@ namespace RecurringIntegrationsScheduler.Job.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Job: {0}. Looking for data entities in manifest file {1}..
/// </summary>
internal static string Job_0_Looking_for_data_entities_in_manifest_file_1 {
get {
return ResourceManager.GetString("Job_0_Looking_for_data_entities_in_manifest_file_1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Job: {0}. Retrying HTTP operation. Exception : {1}.
/// </summary>

9
Job.ExecutionMonitor/Properties/Resources.resx
Просмотреть файл

@ -168,4 +168,13 @@
<data name="Job_0_ExecutionId_1_status_check_returned_2" xml:space="preserve">
<value>Job: {0} ExecutionId: {1} import status check returned: {2}</value>
</data>
<data name="Job_0_Checking_for_error_keys_for_data_entity_1" xml:space="preserve">
<value>Job: {0}. Checking for error keys file for data entity {1}.</value>
</data>
<data name="Job_0_Checking_if_error_keys_file_was_generated" xml:space="preserve">
<value>Job: {0}. Checking if error keys file was generated.</value>
</data>
<data name="Job_0_Looking_for_data_entities_in_manifest_file_1" xml:space="preserve">
<value>Job: {0}. Looking for data entities in manifest file {1}.</value>
</data>
</root>

2
Job.ExecutionMonitor/packages.config
Просмотреть файл

@ -2,6 +2,6 @@
<packages>
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
<package id="Polly" version="7.0.3" targetFramework="net472" />
<package id="Polly" version="7.1.0" targetFramework="net472" />
<package id="Quartz" version="3.0.7" targetFramework="net461" />
</packages>

2
Job.Export/Job.Export.csproj
Просмотреть файл

@ -40,7 +40,7 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.7.0.3\lib\netstandard2.0\Polly.dll</HintPath>
<HintPath>..\packages\Polly.7.1.0\lib\netstandard2.0\Polly.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>

2
Job.Export/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Polly" version="7.0.3" targetFramework="net472" />
<package id="Polly" version="7.1.0" targetFramework="net472" />
<package id="Quartz" version="3.0.7" targetFramework="net461" />
</packages>

2
Job.Import/Job.Import.csproj
Просмотреть файл

@ -43,7 +43,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.7.0.3\lib\netstandard2.0\Polly.dll</HintPath>
<HintPath>..\packages\Polly.7.1.0\lib\netstandard2.0\Polly.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>

2
Job.Import/packages.config
Просмотреть файл

@ -2,6 +2,6 @@
<packages>
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
<package id="Polly" version="7.0.3" targetFramework="net472" />
<package id="Polly" version="7.1.0" targetFramework="net472" />
<package id="Quartz" version="3.0.7" targetFramework="net461" />
</packages>

2
Job.ProcessingMonitor/Job.ProcessingMonitor.csproj
Просмотреть файл

@ -43,7 +43,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.7.0.3\lib\netstandard2.0\Polly.dll</HintPath>
<HintPath>..\packages\Polly.7.1.0\lib\netstandard2.0\Polly.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>

2
Job.ProcessingMonitor/ProcessingMonitor.cs
Просмотреть файл

@ -186,8 +186,6 @@ namespace RecurringIntegrationsScheduler.Job
// If status was found and is not null,
if (jobStatusDetail != null)
PostProcessMessage(jobStatusDetail, dataMessage);
System.Threading.Thread.Sleep(_settings.Interval);
}
}

2
Job.ProcessingMonitor/packages.config
Просмотреть файл

@ -2,6 +2,6 @@
<packages>
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
<package id="Polly" version="7.0.3" targetFramework="net472" />
<package id="Polly" version="7.1.0" targetFramework="net472" />
<package id="Quartz" version="3.0.7" targetFramework="net461" />
</packages>

2
Job.Upload/Job.Upload.csproj
Просмотреть файл

@ -40,7 +40,7 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.7.0.3\lib\netstandard2.0\Polly.dll</HintPath>
<HintPath>..\packages\Polly.7.1.0\lib\netstandard2.0\Polly.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>

2
Job.Upload/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Polly" version="7.0.3" targetFramework="net472" />
<package id="Polly" version="7.1.0" targetFramework="net472" />
<package id="Quartz" version="3.0.7" targetFramework="net461" />
</packages>

3
Scheduler/Forms/ImportJob.cs
Просмотреть файл

@ -615,7 +615,8 @@ namespace RecurringIntegrationsScheduler.Forms
{SettingsConstants.IndefinitePause, pauseIndefinitelyCheckBox.Checked.ToString()},
{SettingsConstants.GetImportTargetErrorKeysFile, downloadErrorKeysFileCheckBox.Checked.ToString()},
{SettingsConstants.GetImportTargetErrorKeysFileUrlPath, getImportTargetErrorKeysFileUrlPath},
{SettingsConstants.GenerateImportTargetErrorKeysFilePath, generateImportTargetErrorKeysFilePath}
{SettingsConstants.GenerateImportTargetErrorKeysFilePath, generateImportTargetErrorKeysFilePath},
{SettingsConstants.PackageTemplate, packageTemplateTextBox.Text}
};
if (serviceAuthRadioButton.Checked)
{

6
Scheduler/Scheduler.csproj
Просмотреть файл

@ -67,10 +67,10 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
<HintPath>..\packages\Polly.7.0.3\lib\netstandard2.0\Polly.dll</HintPath>
<HintPath>..\packages\Polly.7.1.0\lib\netstandard2.0\Polly.dll</HintPath>
</Reference>
<Reference Include="PortableSettingsProvider, Version=0.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\PortableSettingsProvider.0.2.1\lib\net45\PortableSettingsProvider.dll</HintPath>
<Reference Include="PortableSettingsProvider, Version=0.2.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\PortableSettingsProvider.0.2.2\lib\net45\PortableSettingsProvider.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>

4
Scheduler/packages.config
Просмотреть файл

@ -2,7 +2,7 @@
<packages>
<package id="log4net" version="2.0.8" targetFramework="net46" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
<package id="Polly" version="7.0.3" targetFramework="net472" />
<package id="PortableSettingsProvider" version="0.2.1" targetFramework="net472" />
<package id="Polly" version="7.1.0" targetFramework="net472" />
<package id="PortableSettingsProvider" version="0.2.2" targetFramework="net472" />
<package id="Quartz" version="3.0.7" targetFramework="net461" />
</packages>

2
Version.cs
Просмотреть файл

@ -2,4 +2,4 @@
Licensed under the MIT License. */
using System.Reflection;
[assembly: AssemblyVersion("2.7.0.0")]
[assembly: AssemblyVersion("2.7.1.0")]