Skip to content

Commit

Permalink
Merge branch 'websocket'
Browse files Browse the repository at this point in the history
  • Loading branch information
saubyk committed Nov 27, 2021
2 parents 1fe3611 + 2b4a643 commit d9c0a2b
Show file tree
Hide file tree
Showing 5 changed files with 2,656 additions and 1,073 deletions.
8 changes: 8 additions & 0 deletions cl-rest.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const app = require('./app');
const docapp = require('./docapp');
const mcrn = require('./utils/bakeMacaroons');
const wsServer = require('./utils/webSocketServer');
fs = require( 'fs' );

const { execSync } = require( 'child_process' );
Expand Down Expand Up @@ -120,6 +121,13 @@ else {
process.exit(1);
}

try {
wsServer.mountWebServer(server);
} catch (err) {
global.logger.warn("Failed to start websocket server");
global.logger.error( err );
}

//Instantiate the doc server
docserver = require( 'http' ).createServer( docapp );

Expand Down
Loading

0 comments on commit d9c0a2b

Please sign in to comment.