[rqd] Remove extra space and extra MB from log output. (#1031)

AcademySoftwareFoundation · Sep 12, 2021 · 1cedc89 · 1cedc89
1 parent 9290909
commit 1cedc89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportHandler.java b/cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportHandler.java
@@ -430,7 +430,7 @@ private void handleMemoryReservations(final DispatchHost host, final HostReport
  + proc.getName() + " was OOM");
  try {
  killQueue.execute(new DispatchRqdKillFrame(proc, "The frame required " +
- CueUtil.KbToMb(f.getRss()) + "MB but the machine only has " +
+ CueUtil.KbToMb(f.getRss()) + " but the machine only has " +
  CueUtil.KbToMb(host.memory), rqdClient));
  } catch (TaskRejectedException e) {
  logger.warn("Unable to queue RQD kill, task rejected, " + e);

diff --git a/rqd/rqd/rqcore.py b/rqd/rqd/rqcore.py
@@ -183,7 +183,8 @@ def __writeFooter(self):
  self.endTime = time.time()
  self.frameInfo.runTime = int(self.endTime - self.startTime)
  try:
- print("\n", "="*59, file=self.rqlog)
+ print("", file=self.rqlog)
+ print("="*59, file=self.rqlog)
  print("RenderQ Job Complete\n", file=self.rqlog)
  print("%-20s%s" % ("exitStatus", self.frameInfo.exitStatus), file=self.rqlog)
  print("%-20s%s" % ("exitSignal", self.frameInfo.exitSignal), file=self.rqlog)