Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge
This commit is contained in:
commit
c11c68d6d7
@ -191,6 +191,7 @@ public class JobBoss : GlobalBase
|
|||||||
string newJobFilePath = Path.Join(TrangaSettings.jobsFolderPath, $"{job.id}.json");
|
string newJobFilePath = Path.Join(TrangaSettings.jobsFolderPath, $"{job.id}.json");
|
||||||
string oldFilePath = Path.Join(TrangaSettings.jobsFolderPath, oldFile);
|
string oldFilePath = Path.Join(TrangaSettings.jobsFolderPath, oldFile);
|
||||||
|
|
||||||
|
//Delete old file
|
||||||
if (File.Exists(oldFilePath))
|
if (File.Exists(oldFilePath))
|
||||||
{
|
{
|
||||||
Log($"Deleting Job-file {oldFilePath}");
|
Log($"Deleting Job-file {oldFilePath}");
|
||||||
@ -206,12 +207,16 @@ public class JobBoss : GlobalBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Export job (in new file) if it is still in our jobs list
|
||||||
|
if (GetJobById(job.id) is not null)
|
||||||
|
{
|
||||||
Log($"Exporting Job {newJobFilePath}");
|
Log($"Exporting Job {newJobFilePath}");
|
||||||
string jobStr = JsonConvert.SerializeObject(job, Formatting.Indented);
|
string jobStr = JsonConvert.SerializeObject(job, Formatting.Indented);
|
||||||
while(IsFileInUse(newJobFilePath))
|
while(IsFileInUse(newJobFilePath))
|
||||||
Thread.Sleep(10);
|
Thread.Sleep(10);
|
||||||
File.WriteAllText(newJobFilePath, jobStr);
|
File.WriteAllText(newJobFilePath, jobStr);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void UpdateAllJobFiles()
|
private void UpdateAllJobFiles()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user