Skip to content

Commit

Permalink
remove micro
Browse files Browse the repository at this point in the history
  • Loading branch information
morriq committed Oct 1, 2018
1 parent f176da5 commit 94da1ad
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 36 deletions.
7 changes: 5 additions & 2 deletions environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@ const setConsul = (consulAddress) => ({ consulAddress })
const setTracing = (tracingAddress) => ({ tracingAddress })
const setName = (name) => ({ name })
const setServiceName = (serviceName) => ({ serviceName })
const setPort = port => ({ port })

const { env } = process
const {
TRACING_HOST,
CONSUL_HOST,
npm_package_name
npm_package_name,
npm_package_config_port
} = env

module.exports = ({
...setServiceName(npm_package_name.replace(/-/g, ':')),
...setName(npm_package_name),
...setTracing(TRACING_HOST),
...setConsul(CONSUL_HOST)
...setConsul(CONSUL_HOST),
...setPort(Number(npm_package_config_port))
})
13 changes: 7 additions & 6 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const { initTracer, PrometheusMetricsFactory, ProbabilisticSampler } = require('jaeger-client')
const promClient = require('prom-client')
const bunyan = require('bunyan')
const { createLogger } = require('bunyan')
const consul = require('consul')
const { createServer } = require('http')

const { serviceName, tracingAddress, consulAddress } = require('./environment.js')
const { serviceName, port, tracingAddress, consulAddress } = require('./environment.js')
const microservices = require('./microservices.js')


Expand All @@ -24,21 +25,21 @@ const { requestHandler } = microservices(
host: tracingAddress,
sampler: new ProbabilisticSampler(1),
metrics: new PrometheusMetricsFactory(promClient, serviceName),
logger: bunyan.createLogger({
logger: createLogger({
name: serviceName
})
})
)

module.exports = async (request, response) => {
createServer((request, response) => {
if (request.url === '/favicon.ico') {
response.writeHead(200, { 'Content-Type': 'image/x-icon' })
response.end('')
return
return
}

request.headers['x-request-uri'] = request.url
request.url = '/index'

requestHandler(request, response)
}
}).listen(port)
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build-fragments": "lerna run build",
"start-fragments": "lerna run --parallel start",
"watch-fragments": "lerna run --parallel watch",
"start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
"start": "node index.js"
},
"config": {
"port": "80"
Expand Down Expand Up @@ -36,7 +36,6 @@
"bunyan": "^1.8.12",
"consul": "^0.34.0",
"jaeger-client": "^3.12.0",
"micro": "^9.3.3",
"node-cmd": "^3.0.0",
"opentracing": "^0.14.3",
"prom-client": "^11.1.1"
Expand Down
5 changes: 3 additions & 2 deletions packages/fragment-common/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const consul = require('consul')
const { parse } = require('url')
const { createReadStream } = require('fs')
const { createServer } = require('http')

const { consulAddress, address, hostname, port, getUrl } = require('./environment.js')

Expand All @@ -19,7 +20,7 @@ agent.service.register({
'logowanie do spana'
})

module.exports = (request, response) => {
createServer((request, response) => {
const { pathname } = parse(request.url)

const bundle = '/dist/bundle.js'
Expand All @@ -38,4 +39,4 @@ module.exports = (request, response) => {
})
return response.end('')
}
}
}).listen(port)
3 changes: 1 addition & 2 deletions packages/fragment-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"build": "webpack --mode production",
"watch": "webpack --watch",
"start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
"start": "node index.js"
},
"config": {
"port": "80"
Expand All @@ -26,7 +26,6 @@
"classnames": "^2.2.5",
"consul": "^0.34.0",
"ip": "^1.1.5",
"micro": "^9.3.3",
"prop-types": "^15.6.2",
"react": "^16.1.1",
"react-dom": "^16.1.1",
Expand Down
7 changes: 4 additions & 3 deletions packages/fragment-react/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const consul = require('consul')
const { createReadStream } = require('fs')
const { parse } = require('url')
const { createServer } = require('http')

const { presets } = require('./.babelrc.js')

Expand All @@ -25,7 +26,7 @@ agent.service.register({
'logowanie do spana'
})

module.exports = async (request, response) => {
createServer(async (request, response) => {
const { pathname } = parse(request.url)

const bundle = '/dist/bundle.js'
Expand All @@ -36,7 +37,7 @@ module.exports = async (request, response) => {
response.writeHead(200, { 'Content-Type': 'application/javascript' })
createReadStream(pathToBundle)
.pipe(response)
break
break
default:
response.writeHead(200, {
'Content-Type': 'text/html',
Expand All @@ -50,4 +51,4 @@ module.exports = async (request, response) => {
`)
stream.pipe(response)
}
}
}).listen(port)
3 changes: 1 addition & 2 deletions packages/fragment-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"build": "webpack --mode production",
"watch": "webpack --watch",
"start": "cross-env BABEL_ENV=server micro -l tcp://0.0.0.0:${npm_package_config_port}"
"start": "cross-env BABEL_ENV=server node index.js"
},
"config": {
"port": "80"
Expand All @@ -18,7 +18,6 @@
"classnames": "^2.2.5",
"consul": "^0.34.0",
"ip": "^1.1.5",
"micro": "^9.3.3",
"prop-types": "^15.6.2",
"react": "^16.1.1",
"react-dom": "^16.1.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/fragment-vue-client/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const consul = require('consul')
const { parse } = require('url')
const { createReadStream } = require('fs')
const { createServer } = require('http')

const { getUrl, consulAddress, address, hostname, port } = require('./environment.js')
const renderStream = require('./render-stream.js')
Expand All @@ -24,7 +25,7 @@ agent.service.register({
'logowanie do spana'
})

module.exports = (request, response) => {
createServer((request, response) => {
const { pathname } = parse(request.url)

switch(pathname) {
Expand All @@ -40,4 +41,4 @@ module.exports = (request, response) => {

renderStream().pipe(response)
}
}
}).listen(port)
3 changes: 1 addition & 2 deletions packages/fragment-vue-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"scripts": {
"build": "webpack --mode production && webpack --mode production --config webpack.server.config.js",
"watch": "webpack --watch",
"start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
"start": "node index.js"
},
"config": {
"port": "80"
Expand All @@ -32,7 +32,6 @@
"axios": "^0.18.0",
"consul": "^0.34.0",
"ip": "^1.1.5",
"micro": "^9.3.3",
"vue": "^2.5.17",
"vuex": "^3.0.1"
}
Expand Down
7 changes: 3 additions & 4 deletions packages/fragment-vue-file-read/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const { initTracer, PrometheusMetricsFactory, ProbabilisticSampler } = require('
const promClient = require('prom-client')
const bunyan = require('bunyan')
const { Tags, FORMAT_HTTP_HEADERS } = require('opentracing')
const { createServer } = require('http')

const renderStream = require('./render-stream.js')
const { consulAddress, address, hostname, port } = require('./environment.js')

const tracingAddress = 'jaeger'
Expand Down Expand Up @@ -41,8 +41,7 @@ agent.service.register({
'logowanie do spana'
})

module.exports = (request, response) => {

createServer((request, response) => {
response.writeHead(200, {
'Content-Type': 'text/html'
})
Expand All @@ -62,4 +61,4 @@ module.exports = (request, response) => {
[Tags.HTTP_URL]: 'teateatae',
[Tags.SPAN_KIND]: Tags.SPAN_KIND_RPC_SERVER
})
}
}).listen(port)
3 changes: 1 addition & 2 deletions packages/fragment-vue-file-read/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"scripts": {
"build": "webpack --mode production --config webpack.server.config.js",
"watch": "webpack --watch",
"start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
"start": "node index.js"
},
"config": {
"port": "80"
Expand All @@ -33,7 +33,6 @@
"consul": "^0.34.0",
"ip": "^1.1.5",
"jaeger-client": "^3.12.0",
"micro": "^9.3.3",
"prom-client": "^11.1.3",
"vue": "^2.5.17"
}
Expand Down
11 changes: 6 additions & 5 deletions packages/fragment-vue-http/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const consul = require('consul')
const { createServer } = require('http')

const renderStream = require('./render-stream.js')
const { consulAddress, address, hostname, port } = require('./environment.js')
Expand All @@ -18,14 +19,14 @@ agent.service.register({
'logowanie do spana'
})

module.exports = async (request, response) => {
response.writeHead(200, {
'Content-Type': 'text/html'
})
createServer((request, response) => {
response.writeHead(200, {
'Content-Type': 'text/html'
})

renderStream()
.on('error', ({ message, stack }) => {
console.log(message, stack)
})
.pipe(response)
}
}).listen(port)
3 changes: 1 addition & 2 deletions packages/fragment-vue-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"scripts": {
"build": "webpack --mode production --config webpack.server.config.js",
"watch": "webpack --watch",
"start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
"start": "node index.js"
},
"config": {
"port": "80"
Expand All @@ -32,7 +32,6 @@
"axios": "^0.18.0",
"consul": "^0.34.0",
"ip": "^1.1.5",
"micro": "^9.3.3",
"vue": "^2.5.17",
"vuex": "^3.0.1"
}
Expand Down

0 comments on commit 94da1ad

Please sign in to comment.