개정판 43e1d368
issue #0000 코드 정리
Change-Id: I7c8ba4ef6d78a7e4f51b72f226507cddac722939
| ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationWCF.cs | ||
|---|---|---|
| 67 | 67 |
|
| 68 | 68 |
if(convertItem != null) |
| 69 | 69 |
{
|
| 70 |
var aliveItems = AliveConvertQueue.Where(x => x.ConvertID == convertItem.ConvertID);
|
|
| 70 |
var aliveItems = AliveConvertQueue.Where(x => x.UniqueKey == convertItem.UniqueKey);
|
|
| 71 | 71 |
} |
| 72 | 72 |
|
| 73 | 73 |
if (!database.SetConvertDoc(ProjectNo, convertID, originfilePath, DocumentID)) |
| ... | ... | |
| 139 | 139 |
private string ConvertProcessAdd(string ProjectNo, string convertID) |
| 140 | 140 |
{
|
| 141 | 141 |
string result = false.ToString(); |
| 142 |
logger.Warn($"WCF ConvertProcessAdd Call ProjectNo:{ProjectNo} convertID:{convertID} ");
|
|
| 142 | 143 |
|
| 143 | 144 |
using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(MarkusDBConnectionString)) |
| 144 | 145 |
{
|
| ... | ... | |
| 151 | 152 |
{
|
| 152 | 153 |
if (AliveConvertQueue.Count(c => c.UniqueKey == convertItem.UniqueKey) == 0) |
| 153 | 154 |
{
|
| 154 |
if (ServiceStation.AliveConvertQueue.Count() < ServiceProperty.PROCESS_COUNT)
|
|
| 155 |
if (AliveConvertQueue.Count() < ServiceProperty.PROCESS_COUNT) |
|
| 155 | 156 |
{
|
| 156 | 157 |
convertItem.ServiceID = this.ServiceID; |
| 157 |
ConvertProcessStart(convertItem); |
|
| 158 |
AliveConvertQueue.Add(convertItem); |
|
| 159 |
|
|
| 160 |
var startResult = ConvertProcessStart(convertItem); |
|
| 161 |
|
|
| 162 |
if(!startResult) |
|
| 163 |
{
|
|
| 164 |
AliveConvertQueue.Remove(convertItem); |
|
| 165 |
} |
|
| 166 |
|
|
| 158 | 167 |
result = true.ToString(); |
| 159 | 168 |
} |
| 160 | 169 |
else |
| 161 | 170 |
{
|
| 162 |
PassConvertItem(ProjectNo, convertID, convertItem.UniqueKey); |
|
| 171 |
//logger.Warn($"ConvertProcessAdd PassConvertItem ProcessCount ProjectNo:{ProjectNo} convertID:{convertID} ");
|
|
| 172 |
///// sub service (다른ip의 서비스로 보낸다) 이중화 |
|
| 173 |
//PassConvertItem(ProjectNo, convertID, convertItem.UniqueKey,true); |
|
| 163 | 174 |
|
| 164 |
logger.Info($"ConvertAdd ConvertProcess Wait ProcessCount ProjectNo:{ProjectNo} convertID:{convertID} ");
|
|
| 175 |
|
|
| 165 | 176 |
result = true.ToString(); |
| 166 | 177 |
} |
| 167 | 178 |
} |
| ... | ... | |
| 241 | 252 |
} |
| 242 | 253 |
} |
| 243 | 254 |
|
| 244 |
var _convertItem = ServiceStation.AliveConvertQueue.Where(f => f.ConvertID == ConvertID);
|
|
| 255 |
var _convertItem = AliveConvertQueue.Where(f => f.ConvertID == ConvertID); |
|
| 245 | 256 |
|
| 246 | 257 |
if (_convertItem.Count() > 0) |
| 247 | 258 |
{
|
내보내기 Unified diff
