diff --git a/app.js b/app.js index 6ae79b1..bff78aa 100644 --- a/app.js +++ b/app.js @@ -15,12 +15,15 @@ const newUIRouter = require('./routes/newUI'); const app = express(); const log4js = require('log4js'); -log4js.configure({ +/*log4js.configure({ appenders: {app: {type: 'file', filename: 'logger.log'}}, categories: {default: {appenders: ['app'], level: 'info'}} -}); +});*/ -const logger = log4js.getLogger('app'); +const logger = log4js.getLogger(); +logger.level = "debug"; +//logger.debug("Some debug messages"); +//const logger = log4js.getLogger('app'); // view engine setup app.set('views', path.join(__dirname, 'views')); app.engine('html', ejs.__express); diff --git a/e2e/app.test.js b/e2e/app.test.js index ff4c687..7ce3ee2 100644 --- a/e2e/app.test.js +++ b/e2e/app.test.js @@ -13,22 +13,6 @@ describe('# test app.js', function () { .expect(200, done); }); - it('GET /api/run', function (done) { - request.post('/api/run').set('Content-Type', 'application/x-www-form-urlencoded').send( - { - Path: './fabric-samples/test-network/', - BatchTimeout:'1', - MaxMessageCount:'10', - AbsoluteMaxBytes:'3', - PreferredMaxBytes:'4', - CoolDown:'5', - PrepareCLI:'./prepareConfig.sh', - StartCLI:'./network.sh', - CCDeployCLI:'./network.sh', - TapeCount: '500', - ShutDownCLI: './network.sh' - }).expect(200, done); - }); it('GET /api/getBatchTimeout', function (done) { request .get('/api/get?data=BatchTimeout') @@ -74,15 +58,20 @@ describe('# test app.js', function () { .get('/result/PreferredMaxBytes') .expect(200, done); }); - /* it('GET /quick/BatchTimeout', function (done) { - request - .get('/quick/BatchTimeout') - .expect(200, done); + it('GET /api/run', function (done) { + request.post('/api/run').set('Content-Type', 'application/x-www-form-urlencoded').send( + { + Path: './fabric-samples/test-network/', + BatchTimeout:'1', + MaxMessageCount:'10', + AbsoluteMaxBytes:'3', + PreferredMaxBytes:'4', + CoolDown:'5', + PrepareCLI:'./prepareConfig.sh', + StartCLI:'./network.sh', + CCDeployCLI:'./network.sh', + TapeCount: '500', + ShutDownCLI: './network.sh' + }).expect(200, done); }); - - it('GET /quick/MaxMessageCount', function (done) { - request - .get('/quick/MaxMessageCount') - .expect(200, done); - });*/ }); \ No newline at end of file