about summary refs log tree commit diff
path: root/streaming/index.js
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-10-18 11:52:04 -0500
committerDavid Yip <yipdw@member.fsf.org>2017-10-18 11:52:04 -0500
commit42e8c8eb0e9964d157ac160b3f816e58a771f045 (patch)
treec3f044eacc21ff65d9cb1bf20d111aaff6c86074 /streaming/index.js
parent4421f6598f5883908fb25743977306f19a0b0f0f (diff)
parent09d81defcda96eae7ffba36ccf1fb091ce08f17b (diff)
Merge tag 'v2.0.0' into gs-master
Diffstat (limited to 'streaming/index.js')
-rw-r--r--streaming/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/index.js b/streaming/index.js
index 017073fa1..83903b89b 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -80,7 +80,7 @@ const startWorker = (workerId) => {
     development: {
       user:     process.env.DB_USER || pg.defaults.user,
       password: process.env.DB_PASS || pg.defaults.password,
-      database: 'mastodon_development',
+      database: process.env.DB_NAME || 'mastodon_development',
       host:     process.env.DB_HOST || pg.defaults.host,
       port:     process.env.DB_PORT || pg.defaults.port,
       max:      10,