Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge
This commit is contained in:
commit
f46244cb9c
@ -28,9 +28,9 @@ public class JobBoss : GlobalBase
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Log($"Added {job}");
|
|
||||||
if (!this.jobs.Add(job))
|
if (!this.jobs.Add(job))
|
||||||
return false;
|
return false;
|
||||||
|
Log($"Added {job}");
|
||||||
UpdateJobFile(job, jobFile);
|
UpdateJobFile(job, jobFile);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@ -167,8 +167,12 @@ public class JobBoss : GlobalBase
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
Log($"Adding Job {job}");
|
Log($"Adding Job {job}");
|
||||||
if(!AddJob(job, file.Name)) //If we detect a duplicate, delete the file.
|
if (!AddJob(job, file.FullName)) //If we detect a duplicate, delete the file.
|
||||||
file.Delete();
|
{
|
||||||
|
string path = string.Concat(file.FullName, ".failed");
|
||||||
|
file.MoveTo(path);
|
||||||
|
Log($"Duplicate detected or otherwise not able to add job to list.\nMoved job {job} to {path}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user