fix(server): little makeup for server version

This commit is contained in:
Alexey Kasyanchuk
2018-04-07 10:43:08 +03:00
parent ec93cd9ea4
commit 3b49d52afe
4 changed files with 16 additions and 6 deletions

2
.gitignore vendored
View File

@ -2,9 +2,11 @@ node_modules
.DS_Store .DS_Store
Thumbs.db Thumbs.db
*.log *.log
rats.json
/dist /dist
/temp /temp
/web
# ignore everything in 'app' folder what had been generated from 'src' folder # ignore everything in 'app' folder what had been generated from 'src' folder
/app/app.js /app/app.js

View File

@ -12,6 +12,7 @@
"type": "git", "type": "git",
"url": "https://github.com/DEgITx/rats-search.git" "url": "https://github.com/DEgITx/rats-search.git"
}, },
"serverDataDirectory": "./",
"build": { "build": {
"appId": "com.ratsontheboat.search", "appId": "com.ratsontheboat.search",
"files": [ "files": [
@ -105,7 +106,8 @@
"start": "node build/start.js", "start": "node build/start.js",
"prebuild": "webpack --config=build/webpack.app.config.js --env=production", "prebuild": "webpack --config=build/webpack.app.config.js --env=production",
"build": "electron-builder", "build": "electron-builder",
"server": "node src/background/server.js" "server": "node src/background/server.js",
"buildweb": "node src/background/webpack.js"
}, },
"dependencies": { "dependencies": {
"bencode": "^1.0.0", "bencode": "^1.0.0",

View File

@ -8,6 +8,10 @@ const express = require('express');
const app = express(); const app = express();
const server = http.Server(app); const server = http.Server(app);
const io = require('socket.io')(server); const io = require('socket.io')(server);
const fs = require('fs');
const path = require('path')
const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
server.listen(appConfig.httpPort); server.listen(appConfig.httpPort);
console.log('Listening web server on', appConfig.httpPort, 'port') console.log('Listening web server on', appConfig.httpPort, 'port')
@ -28,6 +32,6 @@ sphinx = startSphinx(() => {
dbPatcher(() => { dbPatcher(() => {
spider = spiderCall((...data) => io.sockets.emit(...data), (message, callback) => { spider = spiderCall((...data) => io.sockets.emit(...data), (message, callback) => {
socketMessages[message] = callback socketMessages[message] = callback
}, './', '0.7.1', 'development') }, path.resolve(packageJson.serverDataDirectory), packageJson.version, 'production')
}, null, sphinx) }, null, sphinx)
}, './', () => {}) }, path.resolve(packageJson.serverDataDirectory), () => {})

View File

@ -6,7 +6,9 @@ compiler.run((err, stats) => {
if(err) if(err)
throw new Error(err) throw new Error(err)
console.log('succesfully builder')
if(stats.compilation.errors) if(stats.compilation.errors && stats.compilation.errors.length > 0)
console.error(stats.compilation.errors) console.error('compilation errors', stats.compilation.errors)
else
console.log('succesfully builded web version')
}) })