From 400ab136ba9a03d47fa1ce1fa1029467d439828a Mon Sep 17 00:00:00 2001
From: Alex Freska <alex.freska@gmail.com>
Date: Wed, 31 Jan 2024 12:30:01 -0400
Subject: [PATCH] fix daemon control

---
 .github/workflows/pr.yml                      |  1 +
 hostd/main/daemon.ts                          | 12 ++++++++----
 hostd/renderer/components/useConfigData.tsx   |  4 +---
 renterd/main/daemon.ts                        |  8 +++++---
 renterd/renderer/components/Header.tsx        |  1 -
 renterd/renderer/components/useConfigData.tsx |  4 +---
 renterd/renderer/contexts/config/index.tsx    |  2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index cb0dc65..df4c161 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,4 +1,5 @@
 name: PR
+
 on:
   pull_request:
 
diff --git a/hostd/main/daemon.ts b/hostd/main/daemon.ts
index 512cb25..ae30464 100644
--- a/hostd/main/daemon.ts
+++ b/hostd/main/daemon.ts
@@ -1,17 +1,17 @@
 import { spawn } from 'child_process'
 import { state } from './state'
 import { getConfig, getConfigFilePath } from './config'
+import { getBinaryDirectoryPath, getBinaryFilePath } from './binary'
 import path from 'path'
 import fs from 'fs'
-import { getBinaryDirectoryPath, getBinaryFilePath } from './binary'
 
 export async function startDaemon(): Promise<void> {
   try {
     await stopDaemon()
     const config = getConfig()
     const binaryFilePath = getBinaryFilePath()
-    state.daemon = spawn(binaryFilePath, ['-env'], {
-      env: { ...process.env, HOSTD_CONFIG_FILE: getConfigFilePath() },
+    state.daemon = spawn(binaryFilePath, [], {
+      env: { ...process.env, RENTERD_CONFIG_FILE: getConfigFilePath() },
       cwd: config.directory,
     })
 
@@ -25,12 +25,16 @@ export async function startDaemon(): Promise<void> {
       // Emit events or log data as needed
     })
 
+    state.daemon.on('error', (err) => {
+      console.log(`child process exited with error ${err}`)
+      state.daemon = null
+    })
+
     state.daemon.on('close', (code) => {
       console.log(`child process exited with code ${code}`)
       state.daemon = null
     })
   } catch (err) {
-    console.log('Failed to start daemon', err)
     state.daemon = null
     throw err
   }
diff --git a/hostd/renderer/components/useConfigData.tsx b/hostd/renderer/components/useConfigData.tsx
index cc297ec..f93ed2a 100644
--- a/hostd/renderer/components/useConfigData.tsx
+++ b/hostd/renderer/components/useConfigData.tsx
@@ -28,9 +28,7 @@ export function useConfigData() {
   return useSWR<Config>(
     'config',
     async () => {
-      const config = await window.electron.getConfig()
-      console.log(config)
-      return config
+      return window.electron.getConfig()
     },
     {
       refreshInterval: 10_000,
diff --git a/renterd/main/daemon.ts b/renterd/main/daemon.ts
index f44c7bd..ae30464 100644
--- a/renterd/main/daemon.ts
+++ b/renterd/main/daemon.ts
@@ -25,14 +25,17 @@ export async function startDaemon(): Promise<void> {
       // Emit events or log data as needed
     })
 
+    state.daemon.on('error', (err) => {
+      console.log(`child process exited with error ${err}`)
+      state.daemon = null
+    })
+
     state.daemon.on('close', (code) => {
       console.log(`child process exited with code ${code}`)
       state.daemon = null
     })
   } catch (err) {
-    console.log('Failed to start daemon', err)
     state.daemon = null
-    console.log('state is', state)
     throw err
   }
 }
@@ -54,7 +57,6 @@ export function stopDaemon(): Promise<void> {
 }
 
 export function getIsDaemonRunning(): boolean {
-  console.log('daemon', state)
   return !!state.daemon && !state.daemon.killed
 }
 
diff --git a/renterd/renderer/components/Header.tsx b/renterd/renderer/components/Header.tsx
index 0294e05..9171466 100644
--- a/renterd/renderer/components/Header.tsx
+++ b/renterd/renderer/components/Header.tsx
@@ -18,7 +18,6 @@ export function Header() {
     useConfig()
   const config = useConfigData()
   const installedVersion = useInstalledVersion()
-  console.log(isRunning.data)
   return (
     <Panel
       className="sticky z-10 top-0 w-full h-10 flex gap-2 justify-center items-center px-3 max-w-[500px] rounded-t-none"
diff --git a/renterd/renderer/components/useConfigData.tsx b/renterd/renderer/components/useConfigData.tsx
index 52b411d..804cf3a 100644
--- a/renterd/renderer/components/useConfigData.tsx
+++ b/renterd/renderer/components/useConfigData.tsx
@@ -24,9 +24,7 @@ export function useConfigData() {
   return useSWR<Config>(
     'config',
     async () => {
-      const config = await window.electron.getConfig()
-      console.log(config)
-      return config
+      return window.electron.getConfig()
     },
     {
       refreshInterval: 10_000,
diff --git a/renterd/renderer/contexts/config/index.tsx b/renterd/renderer/contexts/config/index.tsx
index fe3e8cd..d591e2a 100644
--- a/renterd/renderer/contexts/config/index.tsx
+++ b/renterd/renderer/contexts/config/index.tsx
@@ -114,7 +114,7 @@ function useConfigMain() {
         setSettings({
           password: values.httpPassword,
         })
-        if (notConfiguredYet) {
+        if (closeWindowAfterSave) {
           window.electron.closeWindow()
         }
       } catch (e) {