Merge branch 'master' of https://github.com/learnlinux/tuxlab-app

Author: DerekTBrown

package.json

@@ -49,7 +49,8 @@
     "rxjs": "5.0.0-beta.6",
     "simplemde": "^1.11.2",
     "winston": "^2.2.0",
-    "zone.js": "^0.6.12"
+    "zone.js": "^0.6.12",
+    "winston-mongodb": "~1.6.0"
   },
   "devDependencies": {
     "bson": "^0.5.0",

private/settings.env.json

@@ -4,5 +4,8 @@
   "etcd_node_ip": "192.168.56.102",
   "etcd_node_port": "2379",
   "etcd_user": "cem",
-  "etcd_pass": "ersoz"
+  "etcd_pass": "ersoz",
+  "default_image": "alpine",
+  "mongo_log_url" : "ds025792.mlab.com:25792/tuxlab",
+  "mongo_log_collection" : "logs"
 }

server/imports/startup/log.js

@@ -2,9 +2,17 @@
   Winston Logger for TuxLab-app
 */
 var winston = require('winston');
+var nconf = require('nconf');
+
+require('winston-mongodb').MongoDB;
+
+var log_collection_name = nconf.get('mongo_log_collection');
+
+logs_collection = new Mongo.Collection(log_collection_name);
+
 TuxLog = new (winston.Logger)({
   transports: [
      new (winston.transports.Console)(),
-     new (winston.transports.File)({ filename: 'tuxlab.log' }) //Replace with GrayLog
+     new (winston.transports.MongoDB)({db: logs_collection.rawDatabase(), collection: log_collection_name})
    ]
 });

server/main.js

@@ -26,6 +26,9 @@ Collections.labs = labs;
 import {course_records} from "../collections/course_records.ts";
 Collections.course_records = course_records;
 
+Collections.logs = logs_collection;
+
+//import meteor methods
 // LabFile Cache
 var NodeCache = require('node-cache');
     LabCache = new NodeCache({