Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b68a112
Enable http client
ukoelguanche Feb 23, 2019
a9b816c
Some modifications
ukoelguanche Feb 23, 2019
2c1dce3
working version with dynamic port
ukoelguanche Feb 23, 2019
b2090fc
working version with command forward
ukoelguanche Feb 23, 2019
d9f0ea1
WIP capture console.log
ukoelguanche Feb 25, 2019
be86315
parseTable function added
meluko Feb 25, 2019
f4bdf07
Merge branch 'master' of github.com:meluko/fuge into caputre-console-log
meluko Feb 25, 2019
c190dd3
WIP use new parseTable function
meluko Feb 25, 2019
71be870
WIP use new parseTable function
meluko Feb 25, 2019
efb2a44
WIP use new parseTable function
meluko Feb 25, 2019
587175c
WIP: catching logs
meluko Mar 1, 2019
d416cd5
web socket server added
ukoelguanche Mar 3, 2019
f36903b
Update commands.js
ukoelguanche Mar 3, 2019
147d857
Update commands.js
ukoelguanche Mar 3, 2019
c6d9667
Update commands.js
ukoelguanche Mar 3, 2019
0e1ca6e
Update webSocketServer.js
ukoelguanche Mar 3, 2019
05258c7
Update fuge.js
ukoelguanche Mar 3, 2019
1010f01
Update fuge.js
ukoelguanche Mar 3, 2019
771562e
ws server refactor. Also serve statics
ukoelguanche Mar 4, 2019
238290c
parser tests
ukoelguanche Mar 4, 2019
1cf2a16
parser tests
ukoelguanche Mar 4, 2019
4b2d80c
consoleLogCatcher tests
ukoelguanche Mar 4, 2019
c384482
ws server refactor
ukoelguanche Mar 4, 2019
9bb7ca4
Added broadcast to ws server + some refactor
ukoelguanche Mar 5, 2019
b01f95a
bug fixing
ukoelguanche Mar 5, 2019
27c5596
bug fixing II
ukoelguanche Mar 5, 2019
1363f44
bug fixing II
ukoelguanche Mar 5, 2019
4bd1129
bug fixing III
ukoelguanche Mar 5, 2019
368d509
catch log fixed
ukoelguanche Mar 6, 2019
79b1d7d
catch/release logs refactor
ukoelguanche Mar 7, 2019
b157a1c
httpServer deleted
ukoelguanche Mar 7, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ module.exports = function () {
}

var table = new CliTable({chars: tableChars, style: tableStyle, head: ['name'.white, 'type'.white, 'status'.white, 'watch'.white, 'tail'.white], colWidths: [30, 15, 15, 15, 15]})

_.each(system.topology.containers, function (container) {
if (container.type === 'container' && system.global.run_containers === false) {
table.push([container.name.gray, container.type.gray, 'not managed'.gray, '', ''])
Expand Down Expand Up @@ -65,7 +64,6 @@ module.exports = function () {
cb()
}


var showInfo = function (args, system, cb) {
if (args.length > 0) {
if (args.length === 1) {
Expand Down
6 changes: 4 additions & 2 deletions fuge.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
var program = require('commist')()
var shell = require('./shell')(true)
var util = require('./util')()

var webSocketServer = require('./server/webSocketServer')
var commands

function showVersion (args, system, cb) {
console.log('')
Expand Down Expand Up @@ -56,7 +57,8 @@ var runShell = function (args) {
console.log('compiling...')
util.compile(args, function (err, system) {
if (err) { return console.error(err) }
shell.run(system)
commands = shell.run(system)
webSocketServer.init(system, commands)
})
}

Expand Down
38 changes: 38 additions & 0 deletions fuge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
fuge_global:
run_containers: false
dns_enabled: true
dns_host: '127.0.0.1'
dns_port: 7140
dns_suffix: internal
dns_namespace: service
dns_external:
- 'acc-user-api.service.internal IN A 127.0.0.1'
- '_main._tcp.acc-user-api.service.internal IN SRV 0 5 7000 acc-user-api.service.internal'
tail: true
monitor: true
monitor_excludes:
- '**/node_modules/**'
- '**/.git/**'
- '*.log'
- '**/*.swp'
- '**/*.missing.json'
environment:
- "AWS_DEFAULT_REGION=eu-west-1"
- "AWS_ACCOUNT_ID=123456789012"
- "AWS_ACCESS_KEY_ID=foobar"
- "AWS_SECRET_ACCESS_KEY=foobar"
http_server:
port: 3000
forward_to_ports:
acc: 3002

kyc-customer-sim:
type: process
run: "bash -c 'npm run sequelize db:migrate && node --inspect=7123 index.js | npx pino-pretty'"
path: ../../kyc/kyc-customer-sim
environment:
- "DB_URL=postgres://postgres:pass@localhost:7142/kyc-customer-sim"
- "CALLBACK_URL=http://127.0.0.1:7103/customer-simulator/"
- "KYC_PUBLIC_URL=https://127.0.0.1:7143/"
ports:
- main=7103
Loading