qortal.link/qortal-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor electron.js

Browse Source 
startQortal() function refactored to utilize switch/case instead of multi else-if
This commit is contained in:
xspektrex 2023-12-30 10:30:51 -05:00 committed by GitHub
parent e37d075615
commit 3f5e201c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 141 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
electron.js
View File

@ -665,12 +665,16 @@ async function checkAndStart() {
async function startQortal() { async function startQortal() {
if (process.platform === 'linux') { if (process.platform === 'linux') {
if (process.arch === 'x64') { switch (process.arch) {
case 'x64':
if (fs.existsSync(linjavax64bindir)) { if (fs.existsSync(linjavax64bindir)) {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', linjavax64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', linjavax64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
@ -678,19 +682,26 @@ async function startQortal() {
} else { } else {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
} }
} }
} else if (process.arch === 'arm64') { break;
case 'arm64':
if (fs.existsSync(linjavaarm64bindir)) { if (fs.existsSync(linjavaarm64bindir)) {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', linjavaarm64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', linjavaarm64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
@ -698,19 +709,26 @@ async function startQortal() {
} else { } else {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
} }
} }
} else if (process.arch === 'arm') { break;
case 'arm':
if (fs.existsSync(linjavaarmbindir)) { if (fs.existsSync(linjavaarmbindir)) {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', linjavaarmbinfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', linjavaarmbinfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
@ -718,21 +736,28 @@ async function startQortal() {
} else { } else {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
} }
} }
break;
} }
} else if (process.platform === 'darwin') { } else if (process.platform === 'darwin') {
if (process.arch === 'x64') { if (process.arch === 'x64') {
if (fs.existsSync(macjavax64bindir)) { if (fs.existsSync(macjavax64bindir)) {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', macjavax64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', macjavax64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
@ -740,8 +765,11 @@ async function startQortal() {
} else { } else {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
@ -751,8 +779,11 @@ async function startQortal() {
if (fs.existsSync(macjavaaarch64bindir)) { if (fs.existsSync(macjavaaarch64bindir)) {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', macjavaaarch64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', macjavaaarch64binfile, '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
@ -760,8 +791,11 @@ async function startQortal() {
} else { } else {
try { try {
await spawn( await spawn(
'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], 'nohup', ['nice', '-n', '20', 'java', '-Djava.net.preferIPv4Stack=false', '-Xss256m', '-XX:+UseSerialGC', '-jar', qortaljar, qortalsettings, '1>run.log', '2>&1', '&'], {
{ cwd: qortaldir, shell: true, detached: true } cwd: qortaldir,
shell: true,
detached: true
}
) )
} catch (err) { } catch (err) {
log.info('Start qortal error', err) log.info('Start qortal error', err)
@ -771,6 +805,7 @@ async function startQortal() {
} }
} }
const editMenu = Menu.buildFromTemplate([ const editMenu = Menu.buildFromTemplate([
{ {
label: "Qortal", label: "Qortal",