data.coop/pinafore
8
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

Revert "avoid need for foreman"

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bin/run-mastodon.js
View file

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