Feature/query from file

src/index.js

@@ -35,29 +35,20 @@ const config = require('../config/general.json');
 const start = async () => {
 	const PORT = process.env.PORT || 3000;
 
-	logger.info('Apollon initializing');
-
-	// Initialisation of the connectors
-	for (let connectorName in connectors) {
-		connectors[connectorName] = connectors[connectorName].apply({ logger, config });
-	}
+	let childLogger = logger.child({ scope: 'userland' });
 
-	logger.trace('Waiting for connectors to initialize');
-	// Waiting for them to be ready
-	for (let connectorName in connectors) {
-		connectors[connectorName] = await connectors[connectorName];
+	childLogger.domain = function(obj, potMessage){
+		const domain = {scope: "domain"};
+		if(potMessage){
+			childLogger.info(Object.assign(obj,domain), potMessage)
+		} else {
+			childLogger.info(domain, obj);
+		}
 	}
-	logger.trace('Connectors initialized');
 
 	const app = express();
 	logger.trace('Express app started');
 
-	let childLogger = logger.child({ scope: 'userland' });
-
-	// childLogger.domain = function(...args){
-	// 	childLogger.
-	// }
-
 	const context = {
 		PORT,
 		ENDPOINT: config.endpoint || '/',
@@ -69,6 +60,20 @@ const start = async () => {
 	};
 	logger.trace('Created context object');
 
+	logger.info('Apollon initializing');
+
+	// Initialisation of the connectors
+	for (let connectorName in connectors) {
+		connectors[connectorName] = connectors[connectorName].apply(context);
+	}
+
+	logger.trace('Waiting for connectors to initialize');
+	// Waiting for them to be ready
+	for (let connectorName in connectors) {
+		connectors[connectorName] = await connectors[connectorName];
+	}
+	logger.trace('Connectors initialized');
+
 	let authenticateMid = authenticate(context);
 	logger.trace('Authentication middleware generated');
 

src/tests.js

@@ -2,6 +2,8 @@ module.exports = async function tests(context){
     const requireDir = require("require-dir");
     const path = require("path");
     const jasmine = require('jasmine-node');
+    const {promisify} = require('util');
+    const fs = require('fs');
 
     const hook = require("../other/report");
     const childLogger = context.logger.child({scope: "tests"});
@@ -37,6 +39,23 @@ module.exports = async function tests(context){
                 return getClient;
             };
         }
+        if(!client.queryFromFile){
+            client.queryFromFile = function(path){
+                let query = "";
+                let q = promisify(fs.readFile)(path, 'utf8')
+                    .then(file => query = file);
+                ;
+                let queryFromFileRoot = {
+                    send(){
+                        return q.then(_ => client.query(query, {}));
+                    },
+                    injectAndSend(data){
+                        return q.then(_ => client.query(query, data));
+                    }
+                }
+                return queryFromFileRoot;
+            }
+        }
         return client;
     }