NewLife
/
AntJob
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

登录的时候已经有了机器名和进程，上传状态的时候不再需要这两个字段

This commit is contained in:
大石头 2020-04-06 22:55:50 +08:00
parent c20532de00
commit 25f46a4a5e
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AntJob/Data/TaskModel.cs
View File

@ -45,11 +45,11 @@ namespace AntJob.Data
/// <summary>状态</summary>
public JobStatus Status { get; set; }
/// <summary>服务器</summary>
public String Server { get; set; }
///// <summary>服务器</summary>
//public String Server { get; set; }
/// <summary>进程</summary>
public Int32 ProcessID { get; set; }
///// <summary>进程</summary>
//public Int32 ProcessID { get; set; }
/// <summary>数据</summary>
public String Data { get; set; }

13
AntJob/Providers/NetworkJobProvider.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using AntJob.Data;
using NewLife;
@ -145,8 +144,8 @@ namespace AntJob.Providers
#endregion
#region 报告状态
private static readonly String _MachineName = Environment.MachineName;
private static readonly Int32 _ProcessID = Process.GetCurrentProcess().Id;
//private static readonly String _MachineName = Environment.MachineName;
//private static readonly Int32 _ProcessID = Process.GetCurrentProcess().Id;
/// <summary>报告进度，每个任务多次调用</summary>
/// <param name="ctx">上下文</param>
@ -164,8 +163,8 @@ namespace AntJob.Providers
task.Total = ctx.Total;
task.Success = ctx.Success;
task.Server = _MachineName;
task.ProcessID = _ProcessID;
//task.Server = _MachineName;
//task.ProcessID = _ProcessID;
Report(ctx.Handler.Job, task);
}
@ -181,8 +180,8 @@ namespace AntJob.Providers
task.Success = ctx.Success;
task.Times++;
task.Server = _MachineName;
task.ProcessID = _ProcessID;
//task.Server = _MachineName;
//task.ProcessID = _ProcessID;
// 区分正常完成还是错误终止
if (ctx.Error != null)