Revert "avoid need for foreman"

This reverts commit 49ac2f21eb.
This commit is contained in:
Nolan Lawson 2018-03-06 21:32:56 -08:00
parent 15b51bb3eb
commit 7b92f894a4
2 changed files with 13 additions and 25 deletions

View file

@ -21,8 +21,7 @@ OTP_SECRET=foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoo
const mastodonDir = path.join(dir, '../mastodon')
let railsChildProc
let webpackChildProc
let childProc
async function cloneMastodon () {
try {
@ -55,6 +54,7 @@ async function runMastodon () {
console.log('Running mastodon...')
let cmds = [
'gem install bundler',
'gem install foreman',
'bundle install',
'yarn --pure-lockfile'
]
@ -63,19 +63,11 @@ async function runMastodon () {
console.log(cmd)
await exec(cmd, {cwd: mastodonDir})
}
const promise = spawn('foreman', ['start'], {cwd: mastodonDir})
const log = fs.createWriteStream('mastodon.log', {flags: 'a'})
railsChildProc = spawn(
'bundle', ['exec', 'rails', 'server'], {cwd: mastodonDir}
).childProcess
railsChildProc.stdout.pipe(log)
railsChildProc.stderr.pipe(log)
webpackChildProc = spawn(
'./bin/webpack-dev-server', [], {cwd: mastodonDir}
).childProcess
webpackChildProc.stdout.pipe(log)
webpackChildProc.stderr.pipe(log)
childProc = promise.childProcess
childProc.stdout.pipe(log)
childProc.stderr.pipe(log)
}
async function main () {
@ -88,13 +80,9 @@ async function main () {
}
function shutdownMastodon() {
if (railsChildProc) {
console.log('killing rails child process')
railsChildProc.kill()
}
if (webpackChildProc) {
console.log('killing webpack child process')
webpackChildProc.kill()
if (childProc) {
console.log('killing child process')
childProc.kill()
}
}