sync with 0.8.61

DockerfileDev

@@ -28,13 +28,10 @@ COPY . /opt/cronicle
 WORKDIR /opt/cronicle
 
 #optional  step to fix vulnerabilities reported by npm
-#RUN npm audit fix --force
+RUN npm audit fix --force
 
 RUN npm install
 
-# if you run "audit fix" then you need to downgrade chart.js back to v2 (from v3)
-#RUN npm i [email protected] 
-
 RUN node bin/build dist
 
 # protect sensitive folders

htdocs/js/pages/admin/Servers.js

@@ -162,7 +162,7 @@ Class.add( Page.Admin, {
 
 			return [
 				'<div class="td_big" style="white-space:nowrap;"><span class="link" onMouseUp="$P().edit_group('+idx+')">' + self.getNiceGroup(group, null, col_width) + '</span></div>',
-				'<div class="ellip" style="font-family:monospace; max-width:'+col_width+'px;">/' + group.regexp + '/</div>',
+				'<div class="ellip" style="font-family:monospace; max-width:'+col_width+'px;">/' + encode_entities(group.regexp) + '/</div>',
 				// group.description || '(No description)',
 				num_servers ? commify( num_servers) : '(None)',
 				num_events ? commify( num_events ) : '(None)',

lib/job.js

@@ -130,6 +130,11 @@ module.exports = Class.create({
 						return callback(new Error("Maximum of " + category.max_children + " " + Tools.pluralize("job", category.max_children) + " already running for category: " + category.title));
 					}
 				}
+
+				var max_jobs = self.server.config.get('max_jobs') || 0;
+				if (max_jobs && (job_list.length >= max_jobs)) {
+					return callback( new Error("Global maximum of " + max_jobs + " " + Tools.pluralize("job", max_jobs) + " already running.") );
+				}
 
 				if (!category.enabled) {
 					return callback(new Error("Category '" + category.title + "' is disabled."));

lib/test.js

@@ -92,7 +92,7 @@ module.exports = {
 				require('pixl-server-storage'),
 				require('pixl-server-web'),
 				require('pixl-server-api'),
-				require('pixl-server-user'),
+				require('./user.js'),
 				require('./engine.js')
 			]
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Cronicle",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"description": "A simple, distributed task scheduler and runner with a web based UI.",
 	"author": "Joseph Huckaby <[email protected]>",
 	"homepage": "https://github.com/jhuckaby/Cronicle",
@@ -25,28 +25,28 @@
 		"activedirectory2": "^2.1.0",
 		"async": "2.6.0",
 		"bcrypt-node": "0.1.0",
-		"chart.js": "2.7.1",
+		"chart.js": "^2.9.4",
 		"codemirror": "^5.59.2",
 		"dotenv": "^8.2.0",
 		"font-awesome": "4.7.0",
 		"glob": "5.0.15",
-		"jquery": "3.3.1",
+		"jquery": "^3.5.0",
 		"jstimezonedetect": "1.0.6",
 		"mdi": "1.9.33",
 		"mkdirp": "0.5.1",
 		"moment": "2.22.1",
 		"moment-timezone": "0.5.32",
-		"netmask": "1.0.6",
+		"netmask": "^2.0.1",
 		"openssl-wrapper": "^0.3.4",
 		"pixl-args": "^1.0.3",
 		"pixl-class": "^1.0.2",
 		"pixl-cli": "^1.0.8",
 		"pixl-config": "^1.0.5",
 		"pixl-json-stream": "^1.0.6",
 		"pixl-logger": "^1.0.20",
-		"pixl-mail": "^1.0.10",
+		"pixl-mail": "^1.0.11",
 		"pixl-perf": "^1.0.5",
-		"pixl-request": "^1.0.35",
+		"pixl-request": "^1.0.36",
 		"pixl-server": "^1.0.28",
 		"pixl-server-api": "^1.0.2",
 		"pixl-server-storage": "^2.0.10",

sample_conf/config.json

@@ -26,6 +26,7 @@
 	"scheduler_startup_grace": 10,
 	"universal_web_hook": "",
 	"track_manual_jobs": false,
+	"max_jobs": 0,
 
 	"server_comm_use_hostnames": true,
 	"web_direct_connect": false,