mirrors/crontab-ui
1
0
Fork 0
mirror of https://github.com/alseambusher/crontab-ui.git synced 2025-12-15 11:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

adding a check to jobs before importing from file

Browse Source
This commit is contained in:
alseambusher
2016-12-12 17:04:04 +05:30
parent 4226311766
commit b207df5332
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crontab.js
View File

@@ -65,11 +65,17 @@ exports.set_crontab = function(env_vars, callback){
tabs.forEach(function(tab){
if(!tab.stopped) {
if (tab.logging && tab.logging == "true") {
tmp_log = "/tmp/" + tab._id + ".log";
log_file = exports.log_folder + "/" + tab._id + ".log";
let tmp_log = "/tmp/" + tab._id + ".log";
let log_file = exports.log_folder + "/" + tab._id + ".log";
if(tab.command[tab.command.length-1] != ";") // add semicolon
tab.command +=";";
crontab_string += tab.schedule + " { " + tab.command + " } 2> " + tmp_log +"; if test -f " + tmp_log +"; then date >> " + log_file + "; cat " + tmp_log + " >> " + log_file + "; rm " + tmp_log + "; fi \n";
// hook is in beta
if (tab.hook){
let tmp_hook = "/tmp/" + tab._id + ".hook";
crontab_string += tab.schedule + " ({ " + tab.command + " } | tee " + tmp_hook + ") 3>&1 1>&2 2>&3 | tee " + tmp_log +"; if test -f " + tmp_log +"; then date >> " + log_file + "; cat " + tmp_log + " >> " + log_file + "; rm " + tmp_log + "; fi; if test -f " + tmp_hook + "; then " + tab.hook + " < " + tmp_hook + "; rm " + tmp_hook + "; fi \n";
} else {
crontab_string += tab.schedule + " { " + tab.command + " } 2> " + tmp_log +"; if test -f " + tmp_log +"; then date >> " + log_file + "; cat " + tmp_log + " >> " + log_file + "; rm " + tmp_log + "; fi \n";
}
}
else {
crontab_string += tab.schedule + " " + tab.command + "\n";
@@ -96,7 +102,7 @@ exports.get_backup_names = function(){
var backups = [];
fs.readdirSync(__dirname + '/crontabs').forEach(function(file){
// file name begins with backup
if(file.indexOf("backup") == 0){
if(file.indexOf("backup") === 0){
backups.push(file);
}
});
@@ -150,7 +156,10 @@ exports.import_crontab = function(){
var command = line.replace(regex, '').trim();
var schedule = line.replace(command, '').trim();
if(command && schedule){
var is_valid = false;
try { is_valid = cron_parser.parseString(line).expressions.length > 0; } catch (e){}
if(command && schedule && is_valid){
var name = namePrefix + '_' + index;
db.findOne({ command: command, schedule: schedule }, function(err, doc) {