From 1cedc891b08bd79b8c889adf0bb82a32b5de30e7 Mon Sep 17 00:00:00 2001 From: Kazuki Sakamoto Date: Sun, 12 Sep 2021 13:38:49 -0700 Subject: [PATCH] [rqd] Remove extra space and extra MB from log output. (#1031) --- .../com/imageworks/spcue/dispatcher/HostReportHandler.java | 2 +- rqd/rqd/rqcore.py | 3 ++- 2 files changed, 3 insertions(+), 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 index 34e02021e..d9f670838 100644 --- 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 index a6809e85c..7cb08030b 100644 --- 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)