개정판 1d79913e
issue #00000 error notice mail 안 되는 문제 수정
Change-Id: I307236bdea2ca63347b99a174c02e1e53f05a3a7
| ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationTask.cs | ||
|---|---|---|
| 53 | 53 |
}; |
| 54 | 54 |
|
| 55 | 55 |
var sendData = ObjectToBytesStringConvert.ObjectToBytesString(processSendData); |
| 56 |
|
|
| 57 |
#if DEBUG |
|
| 58 |
var convertPath = System.IO.Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase, "Markus.Service.ConvertProcess.exe"); |
|
| 59 |
#else |
|
| 60 | 56 |
var convertPath = System.IO.Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase, "Convert\\Markus.Service.ConvertProcess.exe"); |
| 61 |
#endif |
|
| 57 |
|
|
| 62 | 58 |
ProcessStartInfo startInfo = new ProcessStartInfo |
| 63 | 59 |
{
|
| 64 | 60 |
UseShellExecute = false, |
| ... | ... | |
| 72 | 68 |
}; |
| 73 | 69 |
|
| 74 | 70 |
ConvertProcess.StartInfo = startInfo; |
| 75 |
ConvertProcess.EnableRaisingEvents = false;
|
|
| 76 |
|
|
| 71 |
ConvertProcess.EnableRaisingEvents = true;
|
|
| 72 |
|
|
| 77 | 73 |
System.Diagnostics.Debug.WriteLine("convert process run : " + startInfo.Arguments);
|
| 78 | 74 |
|
| 79 | 75 |
logger.Info($"convert process run : UniqueKey:{convertitem.UniqueKey} ConvertID:{convertitem.ConvertID}" + startInfo.Arguments);
|
| ... | ... | |
| 100 | 96 |
else |
| 101 | 97 |
{
|
| 102 | 98 |
// 모두 사용중일때 점유율이 작은 걸로 사용 |
| 103 |
var CurrentProcessAffinity = AliveConvertQueue.Select(f => f.ProcessorAffinity).Distinct(); |
|
| 99 |
var CurrentProcessAffinity = AliveConvertQueue.Where(x=>x.ProcessorAffinity > 0).Select(f => f.ProcessorAffinity).Distinct();
|
|
| 104 | 100 |
|
| 105 | 101 |
currentAffinity = CurrentProcessAffinity.Min(); |
| 106 | 102 |
ConvertProcess.ProcessorAffinity = new IntPtr(currentAffinity); |
| ... | ... | |
| 272 | 268 |
if (station.Properties.PROCESS_COUNT - station.AliveCount > 0) |
| 273 | 269 |
{
|
| 274 | 270 |
System.Diagnostics.Debug.WriteLine($"{station.Properties.SERVICE_ADDRESS} {station.Properties.PROCESS_COUNT}/{station.AliveCount}");
|
| 275 |
var result = await station.Service.ConvertAddAsync(ProjectNo, ConvertID);
|
|
| 271 |
var result = await station.Service.PassConvertAsync(ProjectNo, ConvertID);
|
|
| 276 | 272 |
|
| 277 | 273 |
if (!result.IsNullOrEmpty()) |
| 278 | 274 |
{
|
| ... | ... | |
| 285 | 281 |
} |
| 286 | 282 |
else |
| 287 | 283 |
{
|
| 288 |
logger.Error($"PassConvertItem Error result : {result} - Service ID : {station.Properties.ID} ConvertID : {ConvertID}");
|
|
| 284 |
logger.Error($"PassConvertItem Error result : {result} - Service ID : {station.Properties.ID} ConvertID : {ConvertID}");
|
|
| 289 | 285 |
} |
| 290 | 286 |
} |
| 291 | 287 |
else |
| ... | ... | |
| 442 | 438 |
System.Diagnostics.Debug.WriteLine("Convert Finish : " + convertitem.ConvertID);
|
| 443 | 439 |
|
| 444 | 440 |
System.Diagnostics.Debug.WriteLine("ServiceStation.AliveConvertQueue.Count() : " + ServiceStation.AliveConvertQueue.Count());
|
| 445 |
|
|
| 446 |
ServiceStation.AliveConvertQueue.RemoveAll(x=>x.ConvertID == convertitem.ConvertID); |
|
| 441 |
|
|
| 442 |
List<string> deleteItems = new List<string> { convertitem.ConvertID };
|
|
| 443 |
|
|
| 444 |
|
|
| 445 |
ServiceStation.AliveConvertQueue.RemoveAll(x=>deleteItems.Any(y=>y == x.ConvertID)); |
|
| 447 | 446 |
|
| 448 | 447 |
System.Diagnostics.Debug.WriteLine("ServiceStation.AliveConvertQueue.Count() : " + ServiceStation.AliveConvertQueue.Count());
|
| 449 | 448 |
|
내보내기 Unified diff
