Compare commits

..

No commits in common. "master" and "v2.0.0" have entirely different histories.

3 changed files with 5 additions and 37 deletions

View file

@ -1,41 +1,12 @@
import path from 'path'
import { readFileSync } from 'fs' import { readFileSync } from 'fs'
import { Util } from 'service-core' import { fileURLToPath } from 'url'
export function run(http, orgPort, ctx) { export function run(http, orgPort, ctx) {
let localUtil = new Util(import.meta.url) let packagePath = ctx.util.getPathFromRoot('./package.json')
let packagePath = localUtil.getPathFromRoot('../package.json')
let packageInfo = JSON.parse(readFileSync(packagePath)) let packageInfo = JSON.parse(readFileSync(packagePath))
const server = http.createServer(function (req, res) { const server = http.createServer(function (req, res) {
const d1 = new Date().getTime()
let finishedRequest = false
var done = function () {
if (finishedRequest) return
finishedRequest = true
var requestTime = new Date().getTime() - d1
let level = 'info'
if (res.statusCode >= 400) {
level = 'warn'
}
if (res.statusCode >= 500) {
level = 'error'
}
let status = ''
if (res.statusCode >= 400) {
status = res.statusCode + ' '
}
ctx.log[level]({
duration: requestTime,
status: res.statusCode,
}, `<-- ${status}${req.method} ${req.url}`)
}
res.addListener('finish', done);
res.addListener('close', done);
res.writeHead(200); res.writeHead(200);
res.write(JSON.stringify(packageInfo, null, ' ')) res.write(JSON.stringify(packageInfo, null, ' '))
res.end() res.end()
@ -43,7 +14,7 @@ export function run(http, orgPort, ctx) {
let port = orgPort || 4000 let port = orgPort || 4000
return server.listenAsync(port) return server.listenAsync(port, '0.0.0.0')
.then(function() { .then(function() {
ctx.log.event.info(`Server is listening on ${port} serving package ${packagePath}`) ctx.log.event.info(`Server is listening on ${port} serving package ${packagePath}`)
ctx.log.info(`Server is listening on ${port} serving package ${packagePath}`) ctx.log.info(`Server is listening on ${port} serving package ${packagePath}`)

View file

@ -60,9 +60,6 @@ on_success:
-H "Authorization: token $deploytoken" \ -H "Authorization: token $deploytoken" \
-F "attachment=@${CURR_VER}_build-sc.7z" \ -F "attachment=@${CURR_VER}_build-sc.7z" \
https://git.nfp.is/api/v1/repos/$APPVEYOR_REPO_NAME/releases/$RELEASE_ID/assets https://git.nfp.is/api/v1/repos/$APPVEYOR_REPO_NAME/releases/$RELEASE_ID/assets
echo "Deplying to production"
curl -X POST http://192.168.93.51:8881/update/helloworld
fi fi
# on build failure # on build failure

View file

@ -1,6 +1,6 @@
{ {
"name": "sc-helloworld", "name": "sc-helloworld",
"version": "2.0.6", "version": "2.0.0",
"description": "Hello World app for service core", "description": "Hello World app for service core",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {