Add runsync option (inline job processing), a few style changes, and …

…a bug fix for double saving jobs

lib/api.js

@@ -214,7 +214,7 @@ app.post('/singlejob/post', function(req, res, next) {
 		response.on('end', function() {
 			var dataObject = JSON.parse(data);
 			// TODO: Check for error, flash message
-			req.flash('Successfully scheduled job');
+			req.flash('success', 'Successfully scheduled job');
 			return res.redirect('/singlejob/create');
 		});
 	});
@@ -230,7 +230,7 @@ app.post('/singlejob/post', function(req, res, next) {
  * @return {object}
  */
 app.get('/singlejob/create', function(req, res, next) {
-	return res.render('singlejob/index.html');
+	return res.render('singlejob/index.html', {messages: req.flash()});
 });
 
 /**

lib/model/singlejob.js

@@ -0,0 +1,14 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+
+var SingleJob = new Schema({
+	Command: String,
+	Parameters: [String],
+	ScheduleDateTime: Date,
+	RunSync: Boolean,
+	RetryOnError: Boolean,
+	LogOutputOnSuccess: Boolean,
+	BindHost: String
+});
+
+exports = module.exports = mongoose.model('SingleJob', SingleJob);

lib/public/assets/styles/all.css

@@ -44,6 +44,9 @@ div.button-row { text-align: center; padding: 15px; }
 #tock-param-add:hover { cursor: pointer; }
 .tock-param-remove:hover { cursor: pointer; }
 
+#messages { margin-top: 25px; }
+#messages .success { padding: 10px 20px; background-color: #6f6; border: 1px solid #292; margin-top: 5px; }
+
 /* - Data table stuff - */
 .dataTable { width: 100%; font-size: 80%; }
 table.dataTable { border-spacing: 0; }

lib/tock.js

@@ -15,6 +15,7 @@ var mongoose = require('mongoose');
 var io = require('socket.io').listen(config.ioSocketPort);
 var Job = require('./model/job');
 var JobSchedule = require('./model/jobschedule');
+var SingleJob = require('./model/singlejob');
 var jsonParse = require('JSONStream').parse;
 
 /**
@@ -122,7 +123,11 @@ var spawnJob = function(job, callback) {
 		}
 	}
 	// Create job model, populate, save
-	var JobModel = new Job(job, true);
+	var JobModel = new Job({
+		JobScheduleId: job._id,
+		Command: job.Command,
+		Parameters: job.Parameters
+	});
 	JobModel.Host = host.host;
 	JobModel.Port = host.port;
 	JobModel.save(function(err) {
@@ -165,6 +170,7 @@ var spawnJob = function(job, callback) {
 			});
 			res.on('end', function() {
 				if (runningJobs[JobModel._id]) delete runningJobs[JobModel._id];
+				console.log(process.memoryUsage());
 				JobModel.save(function(err) {
 					if (err) {
 						errorHandler(errorHandler.ERROR_CRITICAL, err);
@@ -266,11 +272,20 @@ http.createServer(function(request, response) {
 		var reqBody = JSON.parse(data);
 		switch (reqBody.requestType) {
 			case 'spawnJob':
-				// TODO: Only spawn if run now specified
-				spawnJob(reqBody.job, function(err, spawnJobResponse) {
+				var singleJobModel = new SingleJob(reqBody.job, true);
+				if (!singleJobModel.ScheduleDateTime) singleJobModel.ScheduleDateTime = Date.now();
+				singleJobModel.save(function(err) {
 					// TODO: If error
-					response.write(JSON.stringify(spawnJobResponse));
-					response.end();
+					if (reqBody.job.RunSync) {
+						spawnJob(reqBody.job, function(err, spawnJobResponse) {
+							// TODO: If error
+							response.write(JSON.stringify(spawnJobResponse));
+							response.end();
+						});	
+					} else {
+						response.write(JSON.stringify(singleJobModel));
+						response.end();
+					}
 				});
 				break;
 			case 'killJob':

lib/view/layout/default.html

@@ -45,8 +45,11 @@
 			<div id="inner-header">&nbsp;</div>
 			<div id="content">
 				<div id="messages">
-					{% for message in messages %}
-					<div class="{{ message.type }}">{{ message.message }}</div>
+					{% for messageTypes in messages %}
+						{% set myKey = forloop.key %}
+						{% for message in messageTypes %}
+							<div class="{{ myKey }}">{{ message }}</div>
+						{% endfor %}
 					{% endfor %}
 				</div>
 				{% block content %}{% endblock %}

lib/view/singlejob/index.html

@@ -32,7 +32,7 @@ <h2>Single Job Schedule</h2>
 		</div>
 		<div class="input-row">
 			<label>Run Job Now</label>
-			<input type="checkbox" name="Job[RunNow]" id="run-job-now" />
+			<input type="checkbox" name="Job[RunSync]" id="run-job-now" />
 		</div>
 	</div>
 	<div class="button-row">