nameless
/
eris
forked from pinks/eris
1
0
Fork 0
Code Pull Requests Activity

main #15

Merged
nameless merged 5 commits from pinks/eris:main into pr-main 2024-02-08 15:24:34 +00:00
Conversation 0 Commits 5 Files Changed 36 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec4a3c893e - Show all commits

4
app/config.ts
View File

@ -40,7 +40,9 @@ export async function getConfig(): Promise<Config> {
export async function setConfig(newConfig: Partial<Config>): Promise<void> { export async function setConfig(newConfig: Partial<Config>): Promise<void> {
const oldConfig = await getConfig(); const oldConfig = await getConfig();
const config: Config = { const config: Config = {
pausedReason: newConfig.pausedReason ?? oldConfig.pausedReason, pausedReason: newConfig.pausedReason === undefined
? oldConfig.pausedReason
: newConfig.pausedReason,
maxUserJobs: newConfig.maxUserJobs ?? oldConfig.maxUserJobs, maxUserJobs: newConfig.maxUserJobs ?? oldConfig.maxUserJobs,
maxJobs: newConfig.maxJobs ?? oldConfig.maxJobs, maxJobs: newConfig.maxJobs ?? oldConfig.maxJobs,
defaultParams: newConfig.defaultParams ?? oldConfig.defaultParams, defaultParams: newConfig.defaultParams ?? oldConfig.defaultParams,