Clean up log files.

minerjed · Dec 30, 2023 · df4fba2 · df4fba2
1 parent d690de0
commit df4fba2
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 68 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/workspaces/angular-xcash-app/src/app/services/rpc-calls.service.ts b/workspaces/angular-xcash-app/src/app/services/rpc-calls.service.ts
@@ -352,20 +352,15 @@ export class RpcCallsService {
         APIs.exec("killall -9 'xcash-wallet-rpc-linux'");
       }
       await new Promise(resolve => setTimeout(resolve, 10000));
-      // Cleanup
-      if (fs.existsSync(IMPORT_WALLET_FILE)) {
-        fs.unlinkSync(IMPORT_WALLET_FILE);
-      }
-      if (fs.existsSync(rpclog)) {
-        fs.unlinkSync(rpclog);
-      }
-      for (let i = 1; i <= 10; i++) {
-        try {
-          if (fs.existsSync(`${wdir}xcash-wallet-rpc.log-part-${i}`)) {
-            fs.unlinkSync(`${wdir}xcash-wallet-rpc.log-part-${i}`);
+      // Cleanup logs
+      try {
+        const files = fs.readdirSync(wdir);
+        files.forEach((file: any) => {
+          if (file.startsWith('xcash-wallet-rpc')) {
+            fs.unlinkSync(`${wdir}${file}`);
           }
-        } catch (err) {
-        }
+        });
+      } catch (err) {
       }
       await new Promise(resolve => setTimeout(resolve, 5000));
       const rpccommand: string = `${rpcexe} --rpc-bind-port 18285 --disable-rpc-login --log-level 2 --log-file ${rpclog} --wallet-dir ${wdir} --daemon-address ${rnode} --rpc-user-agent ${rpcUserAgent}`;

diff --git a/workspaces/electron-xcash-app/renderer/preload.ts b/workspaces/electron-xcash-app/renderer/preload.ts
@@ -19,7 +19,8 @@ contextBridge.exposeInMainWorld('electronFs', {
 	unlinkSync: fs.unlinkSync,
 	renameSync: fs.renameSync,
 	writeFileSync: fs.writeFileSync,
-	existsSync: fs.existsSync
+	existsSync: fs.existsSync,
+	readdirSync: fs.readdirSync
 });
 
 contextBridge.exposeInMainWorld('electronAPIs', {

diff --git a/workspaces/shared-lib/apis/window-electronFs.ts b/workspaces/shared-lib/apis/window-electronFs.ts
@@ -4,4 +4,5 @@ export interface WindowElectronFs {
     renameSync(oldPath: string, newPath: string): void;
     writeFileSync(filePath: string, data: string | Buffer, options?: { encoding?: string | null; mode?: number | string; flag?: string; }): void;
     existsSync(filePath: string) : boolean;
+    readdirSync(path: string): string[];
   }