admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-12-10 19:53:05 +00:00
parent 61cc48530a
commit 0e2cf7a0c7
7 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/biz/AttachmentBiz.cs
View File

@@ -62,7 +62,7 @@ namespace AyaNova.Biz
try try
{ {
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"Starting..."); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob ");
apiServerState.SetOpsOnly("Attachment file maintenance"); apiServerState.SetOpsOnly("Attachment file maintenance");
//get a list of all attachment files currently on disk //get a list of all attachment files currently on disk

20
server/AyaNova/biz/CustomerBiz.cs
View File

@@ -409,9 +409,9 @@ namespace AyaNova.Biz
private async Task ProcessBatchJobAsync(OpsJob job) private async Task ProcessBatchJobAsync(OpsJob job)
{ {
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}");
List<long> idList = new List<long>(); List<long> idList = new List<long>();
long ProcessedObjectCount = 0; long FailedObjectCount = 0;
JObject jobData = JObject.Parse(job.JobInfo); JObject jobData = JObject.Parse(job.JobInfo);
if (jobData.ContainsKey("idList")) if (jobData.ContainsKey("idList"))
idList = ((JArray)jobData["idList"]).ToObject<List<long>>(); idList = ((JArray)jobData["idList"]).ToObject<List<long>>();
@@ -441,7 +441,8 @@ namespace AyaNova.Biz
case JobSubType.Delete: case JobSubType.Delete:
if (!await DeleteAsync(id)) if (!await DeleteAsync(id))
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
FailedObjectCount++;
} }
break; break;
default: default:
@@ -451,20 +452,19 @@ namespace AyaNova.Biz
{ {
o = await PutAsync(o); o = await PutAsync(o);
if (o == null) if (o == null)
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); {
else await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
ProcessedObjectCount++; FailedObjectCount++;
}
} }
else
ProcessedObjectCount++;
} }
catch (Exception ex) catch (Exception ex)
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id})");
await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex));
} }
} }
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}");
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed);
} }

10
server/AyaNova/biz/HeadOfficeBiz.cs
View File

@@ -371,7 +371,6 @@ namespace AyaNova.Biz
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}"); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}");
List<long> idList = new List<long>(); List<long> idList = new List<long>();
long ProcessedObjectCount = 0;
long FailedObjectCount = 0; long FailedObjectCount = 0;
JObject jobData = JObject.Parse(job.JobInfo); JObject jobData = JObject.Parse(job.JobInfo);
if (jobData.ContainsKey("idList")) if (jobData.ContainsKey("idList"))
@@ -413,12 +412,11 @@ namespace AyaNova.Biz
{ {
o = await PutAsync(o); o = await PutAsync(o);
if (o == null) if (o == null)
{
await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
else FailedObjectCount++;
ProcessedObjectCount++; }
} }
else
ProcessedObjectCount++;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -427,7 +425,7 @@ namespace AyaNova.Biz
} }
} }
await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {ProcessedObjectCount} / {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}");
await JobsBiz.UpdateJobStatusAsync(job.GId, FailedObjectCount == 0 ? JobStatus.Completed : JobStatus.Failed); await JobsBiz.UpdateJobStatusAsync(job.GId, FailedObjectCount == 0 ? JobStatus.Completed : JobStatus.Failed);
} }

21
server/AyaNova/biz/UserBiz.cs
View File

@@ -833,9 +833,9 @@ namespace AyaNova.Biz
private async Task ProcessBatchJobAsync(OpsJob job) private async Task ProcessBatchJobAsync(OpsJob job)
{ {
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}");
List<long> idList = new List<long>(); List<long> idList = new List<long>();
long ChangedObjectCount = 0; long FailedObjectCount = 0;
JObject jobData = JObject.Parse(job.JobInfo); JObject jobData = JObject.Parse(job.JobInfo);
if (jobData.ContainsKey("idList")) if (jobData.ContainsKey("idList"))
idList = ((JArray)jobData["idList"]).ToObject<List<long>>(); idList = ((JArray)jobData["idList"]).ToObject<List<long>>();
@@ -867,7 +867,8 @@ namespace AyaNova.Biz
case JobSubType.Delete: case JobSubType.Delete:
if (!await DeleteAsync(id)) if (!await DeleteAsync(id))
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
FailedObjectCount++;
} }
break; break;
default: default:
@@ -876,23 +877,21 @@ namespace AyaNova.Biz
if (SaveIt) if (SaveIt)
{ {
o = await PutAsync(o); o = await PutAsync(o);
if (o == null) if (o == null)
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); {
else await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
ChangedObjectCount++; FailedObjectCount++;
}
} }
else
ChangedObjectCount++;
} }
catch (Exception ex) catch (Exception ex)
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id})");
await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex));
} }
} }
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} changed {ChangedObjectCount} of {idList.Count}"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}");
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed);
} }

20
server/AyaNova/biz/VendorBiz.cs
View File

@@ -344,9 +344,9 @@ namespace AyaNova.Biz
private async Task ProcessBatchJobAsync(OpsJob job) private async Task ProcessBatchJobAsync(OpsJob job)
{ {
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}");
List<long> idList = new List<long>(); List<long> idList = new List<long>();
long ProcessedObjectCount = 0; long FailedObjectCount = 0;
JObject jobData = JObject.Parse(job.JobInfo); JObject jobData = JObject.Parse(job.JobInfo);
if (jobData.ContainsKey("idList")) if (jobData.ContainsKey("idList"))
idList = ((JArray)jobData["idList"]).ToObject<List<long>>(); idList = ((JArray)jobData["idList"]).ToObject<List<long>>();
@@ -376,7 +376,8 @@ namespace AyaNova.Biz
case JobSubType.Delete: case JobSubType.Delete:
if (!await DeleteAsync(id)) if (!await DeleteAsync(id))
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
FailedObjectCount++;
} }
break; break;
default: default:
@@ -386,20 +387,19 @@ namespace AyaNova.Biz
{ {
o = await PutAsync(o); o = await PutAsync(o);
if (o == null) if (o == null)
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); {
else await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
ProcessedObjectCount++; FailedObjectCount++;
}
} }
else
ProcessedObjectCount++;
} }
catch (Exception ex) catch (Exception ex)
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id})");
await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex));
} }
} }
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}");
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed);
} }

23
server/AyaNova/biz/WidgetBiz.cs
View File

@@ -389,9 +389,9 @@ namespace AyaNova.Biz
private async Task ProcessBatchJobAsync(OpsJob job) private async Task ProcessBatchJobAsync(OpsJob job)
{ {
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}");
List<long> idList = new List<long>(); List<long> idList = new List<long>();
long ProcessedObjectCount = 0; long FailedObjectCount = 0;
JObject jobData = JObject.Parse(job.JobInfo); JObject jobData = JObject.Parse(job.JobInfo);
if (jobData.ContainsKey("idList")) if (jobData.ContainsKey("idList"))
idList = ((JArray)jobData["idList"]).ToObject<List<long>>(); idList = ((JArray)jobData["idList"]).ToObject<List<long>>();
@@ -419,8 +419,10 @@ namespace AyaNova.Biz
SaveIt = TagBiz.ProcessBatchTagOperation(o.Tags, (string)jobData["tag"], jobData.ContainsKey("toTag") ? (string)jobData["toTag"] : null, job.SubType); SaveIt = TagBiz.ProcessBatchTagOperation(o.Tags, (string)jobData["tag"], jobData.ContainsKey("toTag") ? (string)jobData["toTag"] : null, job.SubType);
break; break;
case JobSubType.Delete: case JobSubType.Delete:
if(!await DeleteAsync(id)){ if (!await DeleteAsync(id))
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); {
await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
FailedObjectCount++;
} }
break; break;
default: default:
@@ -430,20 +432,19 @@ namespace AyaNova.Biz
{ {
o = await PutAsync(o); o = await PutAsync(o);
if (o == null) if (o == null)
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); {
else await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
ProcessedObjectCount++; FailedObjectCount++;
}
} }
else
ProcessedObjectCount++;
} }
catch (Exception ex) catch (Exception ex)
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id})");
await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex));
} }
} }
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}");
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed);
} }

20
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -2517,9 +2517,9 @@ namespace AyaNova.Biz
private async Task ProcessBatchJobAsync(OpsJob job) private async Task ProcessBatchJobAsync(OpsJob job)
{ {
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}");
List<long> idList = new List<long>(); List<long> idList = new List<long>();
long ProcessedObjectCount = 0; long FailedObjectCount = 0;
JObject jobData = JObject.Parse(job.JobInfo); JObject jobData = JObject.Parse(job.JobInfo);
if (jobData.ContainsKey("idList")) if (jobData.ContainsKey("idList"))
idList = ((JArray)jobData["idList"]).ToObject<List<long>>(); idList = ((JArray)jobData["idList"]).ToObject<List<long>>();
@@ -2549,7 +2549,8 @@ namespace AyaNova.Biz
case JobSubType.Delete: case JobSubType.Delete:
if (!await DeleteWorkOrderGraphItem(job.ObjectType, id)) if (!await DeleteWorkOrderGraphItem(job.ObjectType, id))
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
FailedObjectCount++;
} }
break; break;
default: default:
@@ -2559,20 +2560,19 @@ namespace AyaNova.Biz
{ {
o = await PutWorkOrderGraphItem(job.ObjectType, o); o = await PutWorkOrderGraphItem(job.ObjectType, o);
if (o == null) if (o == null)
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}: {GetErrorsAsString()}"); {
else await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}");
ProcessedObjectCount++; FailedObjectCount++;
}
} }
else
ProcessedObjectCount++;
} }
catch (Exception ex) catch (Exception ex)
{ {
await JobsBiz.LogJobAsync(job.GId, $"Error processing item {id}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id})");
await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex));
} }
} }
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count}"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}");
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed);
} }