tforgione/3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare for deploy test

Browse Source
This commit is contained in:
Thomas FORGIONE 2015-09-29 09:20:07 +02:00
parent a03dc89195
commit 372f86a504
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/prototype/dbrequests.js vendored
View File

@ -801,7 +801,7 @@ DBReq.ExpCreator.prototype.finish = function() {
// Commit, and then release // Commit, and then release
this.client.query("COMMIT;", function() { this.client.query("COMMIT;", function() {
Log.debug('Exp creation took ' + (Date.now() - self.startTime) + ' ms'); Log.debug('Exp creation took ' + (Date.now() - self.startTime) + ' ms', true);
self.release(); self.release();
self.client = null; self.client = null;

10
lib/NodeLog.js
View File

@ -73,15 +73,13 @@ Log.mailerror = function(error) {
); );
}; };
if (isDev) { Log.debug = function(info, force) {
Log.debug = function(info) { if (isDev || force === true) {
log( log(
'[DBG] ' + (info !== undefined ? info : ''), '[DBG] ' + (info !== undefined ? info : ''),
Colors.ORANGE Colors.ORANGE
); );
}; }
} else { };
Log.debug = function(){};
}
module.exports = Log; module.exports = Log;

17
utils/load/load.js
View File

@ -1,3 +1,6 @@
var baseUrl = 'http://localhost:4000/';
var baseUrl = 'http://3dinterface.no-ip.org/';
function makeId() function makeId()
{ {
var text = ""; var text = "";
@ -18,13 +21,13 @@ var casper = require('casper').create({
var limit = 100; var limit = 100;
casper.start('http://localhost:4000/'); casper.start(baseUrl);
for (var i = 0; i < limit; i++) { for (var i = 0; i < limit; i++) {
(function(i) { (function(i) {
casper.thenOpen('http://localhost:4000/user-study', function() { casper.thenOpen(baseUrl + 'user-study', function() {
console.log(i); console.log(i);
@ -42,12 +45,12 @@ for (var i = 0; i < limit; i++) {
// }, true); // }, true);
this.thenOpen('http://localhost:4000/prototype/tutorial'); this.thenOpen(baseUrl + 'prototype/tutorial');
this.thenOpen('http://localhost:4000/prototype/play'); this.thenOpen(baseUrl + 'prototype/play');
this.thenOpen('http://localhost:4000/prototype/play'); this.thenOpen(baseUrl + 'prototype/play');
this.thenOpen('http://localhost:4000/prototype/play'); this.thenOpen(baseUrl + 'prototype/play');
this.thenOpen('http://localhost:4000/logout'); this.thenOpen(baseUrl + 'logout');
}); });