Commit 38087d83 authored by 神楽坂玲奈's avatar 神楽坂玲奈

fix

parent 54b96fe5
...@@ -3,6 +3,7 @@ _.str = require 'underscore.string' ...@@ -3,6 +3,7 @@ _.str = require 'underscore.string'
_.mixin(_.str.exports()); _.mixin(_.str.exports());
spawn = require('child_process').spawn spawn = require('child_process').spawn
spawnSync = require('child_process').spawnSync spawnSync = require('child_process').spawnSync
settings = require './config.json'
ygopro = require './ygopro.js' ygopro = require './ygopro.js'
roomlist = require './roomlist' if settings.modules.enable_websocket_roomlist roomlist = require './roomlist' if settings.modules.enable_websocket_roomlist
bunyan = require 'bunyan' bunyan = require 'bunyan'
...@@ -23,7 +24,6 @@ moment.locale('zh-cn', { relativeTime : { ...@@ -23,7 +24,6 @@ moment.locale('zh-cn', { relativeTime : {
y : '1年', y : '1年',
yy : '%d年' yy : '%d年'
}}) }})
settings = require './config.json'
log = bunyan.createLogger name: "mycard-room" log = bunyan.createLogger name: "mycard-room"
#redisdb = redis.createClient host: "127.0.0.1", port: settings.modules.redis_port #redisdb = redis.createClient host: "127.0.0.1", port: settings.modules.redis_port
...@@ -413,4 +413,4 @@ class Room ...@@ -413,4 +413,4 @@ class Room
this.delete() this.delete()
return return
module.exports = Room module.exports = Room
\ No newline at end of file
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
spawnSync = require('child_process').spawnSync; spawnSync = require('child_process').spawnSync;
settings = require('./config.json');
ygopro = require('./ygopro.js'); ygopro = require('./ygopro.js');
if (settings.modules.enable_websocket_roomlist) { if (settings.modules.enable_websocket_roomlist) {
...@@ -40,8 +42,6 @@ ...@@ -40,8 +42,6 @@
} }
}); });
settings = require('./config.json');
log = bunyan.createLogger({ log = bunyan.createLogger({
name: "mycard-room" name: "mycard-room"
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment