chopsticks cleans up logs

Moonsong-Labs · Nov 2, 2023 · 7492e9c · 7492e9c
1 parent 78abb1e
commit 7492e9c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/.changeset/sweet-bats-punch.md b/.changeset/sweet-bats-punch.md
@@ -4,4 +4,5 @@
 
 Fixes for tanssi
 - [#295](https://github.com/Moonsong-Labs/moonwall/issues/295)
-- [#297](https://github.com/Moonsong-Labs/moonwall/issues/297)
+- [#297](https://github.com/Moonsong-Labs/moonwall/issues/297)
+- [#278](https://github.com/Moonsong-Labs/moonwall/issues/278)
diff --git a/packages/cli/src/cmds/runNetwork.ts b/packages/cli/src/cmds/runNetwork.ts
@@ -123,7 +123,10 @@ export async function runNetworkCmd(args) {
     },
   ];
 
-  if (env.foundation.type == "dev" && !env.foundation.launchSpec[0].retainAllLogs) {
+  if (
+    (env.foundation.type == "dev" && !env.foundation.launchSpec[0].retainAllLogs) ||
+    (env.foundation.type == "chopsticks" && !env.foundation.launchSpec[0].retainAllLogs)
+  ) {
     clearNodeLogs();
   }
 

diff --git a/packages/cli/src/cmds/runTests.ts b/packages/cli/src/cmds/runTests.ts
@@ -26,7 +26,10 @@ export async function testCmd(envName: string, additionalArgs?: object): Promise
 
   await commonChecks(env);
 
-  if (env.foundation.type == "dev" && !env.foundation.launchSpec[0].retainAllLogs) {
+  if (
+    (env.foundation.type == "dev" && !env.foundation.launchSpec[0].retainAllLogs) ||
+    (env.foundation.type == "chopsticks" && !env.foundation.launchSpec[0].retainAllLogs)
+  ) {
     clearNodeLogs();
   }
   const vitest = await executeTests(env, additionalArgs);

diff --git a/packages/cli/src/internal/cmdFunctions/tempLogs.ts b/packages/cli/src/internal/cmdFunctions/tempLogs.ts
@@ -1,15 +1,15 @@
 import path from "path";
 import fs from "fs";
 
-export function clearNodeLogs() {
+export function clearNodeLogs(silent: boolean = true) {
   const dirPath = path.join(process.cwd(), "tmp", "node_logs");
   if (!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath, { recursive: true });
   }
 
-  // Check for existing log files and delete
   const files = fs.readdirSync(dirPath);
   for (const file of files) {
+    !silent && console.log(`Deleting log: ${file}`);
     if (file.endsWith(".log")) {
       fs.unlinkSync(path.join(dirPath, file));
     }
@@ -32,9 +32,7 @@ export function reportLogLocation(silent: boolean = false) {
     console.error(e);
   }
 
-  if (!silent) {
-    console.log(consoleMessage);
-  }
+  !silent && console.log(consoleMessage);
 
   return filePath.trim();
 }
diff --git a/packages/types/config_schema.json b/packages/types/config_schema.json
@@ -41,6 +41,10 @@
                     },
                     "type": "array"
                 },
+                "retainAllLogs": {
+                    "description": "An optional flag to retain node logs from previous runs.",
+                    "type": "boolean"
+                },
                 "running": {
                     "description": "UNUSED",
                     "type": "boolean"

diff --git a/packages/types/src/config.ts b/packages/types/src/config.ts
@@ -291,6 +291,11 @@ export interface ChopsticksLaunchSpec extends GenericLaunchSpec {
    * This is only supported for single mode chopsticks.
    */
   buildBlockMode?: "batch" | "manual" | "instant";
+
+  /**
+   * An optional flag to retain node logs from previous runs.
+   */
+  retainAllLogs?: boolean;
 }
 
 /**
@@ -317,11 +322,6 @@ export interface DevLaunchSpec extends GenericLaunchSpec {
    */
   newRpcBehaviour?: boolean;
 
-  /**
-   * An optional flag to retain node logs from previous runs.
-   */
-  retainAllLogs?: boolean;
-
   /**
    * An optional object with p2pPort, wsPort, and rpcPort.
    */
@@ -341,6 +341,11 @@ export interface DevLaunchSpec extends GenericLaunchSpec {
      */
     wsPort: number;
   };
+
+  /**
+   * An optional flag to retain node logs from previous runs.
+   */
+  retainAllLogs?: boolean;
 }
 
 /**