From 1cf8185efe1bfd89e5f118e86b98696a174a00b2 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 30 Apr 2026 11:40:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:40:02 30.04.2026. --- html/AM-Backup-UpdateEmail.rsc | 72 +++++++++++++++++++--------------- html/AM-GlobalFunc.rsc | 4 +- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/html/AM-Backup-UpdateEmail.rsc b/html/AM-Backup-UpdateEmail.rsc index 8079049eb..f8470b4f0 100644 --- a/html/AM-Backup-UpdateEmail.rsc +++ b/html/AM-Backup-UpdateEmail.rsc @@ -17,51 +17,59 @@ :local ScriptName [ :jobname ]; :global LogPrint; +:global EditSchedulers; :global OSUpdateMode; -# Add this Script scheduler -:if ([ :len [ /system/scheduler/find where name=$ScriptName ] ] = 0) do={ -:log warning ("System Scheduler for script: " . $ScriptName . " is NOT SET! Fix It Now!"); -:local OnEvent "/system/script/run $ScriptName;"; -:local Comment "Every Day Check For Update Local Issued Certificates."; -#/system/scheduler/add name=$ScriptName comment=$Comment start-time=startup interval=1d on-event=$OnEvent; -} +# :local Comment "Every 7 Day Check For Update and Backup send notification to EMail."; +# :local Interval "7d 00:00:00"; +# :local StartTime "03:41:27"; +# :local StartDate "jan/01/1970"; +# :local Policy "ftp,reboot,read,write,policy,test,password,sniff,sensitive,romon"; +# :set ExitOK true; +# :error false; +:set EditSchedulers do={ on-error Err { + :global LogPrint; + :local SchedName [ :tostr $1 ]; + :local OnEvent [ :tostr $2 ]; + :if ([ :len $OnEvent ] > 0) do={:set OnEvent "/system/script { run $SchedName; }"}; + :local Comment [ :tostr $3 ]; + :if ([ :len $Comment ] = 0) do={:set Comment "Scheduler for script: $SchedName"}; + :local Interval [ :tostr $4 ]; + :if ([ :len $Interval ] = 0) do={:set Interval "1d"}; + :local StartTime [ :tostr $5 ]; + :if ([ :len $StartTime ] = 0) do={:set StartTime [get time]}; + :local StartDate [ :tostr $6 ]; + :if ([ :len $StartDate ] = 0) do={:set StartDate [get date]}; + :local Policy [ :tostr $7 ]; + :if ([ :len $Policy ] = 0) do={:set Policy "ftp,reboot,read,write,policy,test,password,sniff,sensitive,romon"}; -# Add this Script scheduler -:set ScripsSchedulers do={ o} -:local OnEvent "/system/script { run $ScriptName; }"; -:local Comment "Every 7 Day Check For Update and Backup send notification to EMail."; -:local Interval "7d 00:00:00"; -:local StartTime "03:41:27"; -:local StartDate "jan/01/1970"; -:local Policy "ftp,reboot,read,write,policy,test,password,sniff,sensitive,romon"; +} do={ # Check if scheduler exists, if not - create it -:if ([ :len [ /system/scheduler/find where name=$ScriptName ] ] = 0) do={ - $LogPrint warning $ScriptName ("System Scheduler for script: " . $ScriptName . " is NOT SET! Fix It Now!"); - /system/scheduler/add name=$ScriptName on-event=$OnEvent comment=$Comment interval=$Interval policy=$Policy start-time=$StartTime start-date=$StartDate; - :set ExitOK true; - :error false; +:if ([ :len [ /system/scheduler/find where name=$SchedName ] ] = 0) do={ + $LogPrint warning $SchedName ("System Scheduler for script: " . $SchedName . " is NOT SET! Fix It Now!"); + /system/scheduler/add name=$SchedName on-event=$OnEvent comment=$Comment interval=$Interval policy=$Policy start-time=$StartTime start-date=$StartDate; } # Check if scheduler parameters are correct, if not - fix them -:if ([ /system/scheduler/get $ScriptName on-event ] != $OnEvent) do={ - /system/scheduler/set $ScriptName on-event=$OnEvent; +:if ([ /system/scheduler/get $SchedName on-event ] != $OnEvent) do={ + /system/scheduler/set $SchedName on-event=$OnEvent; } -:if ([ /system/scheduler/get $ScriptName comment ] != $Comment) do={ - /system/scheduler/set $ScriptName comment=$Comment; +:if ([ /system/scheduler/get $SchedName comment ] != $Comment) do={ + /system/scheduler/set $SchedName comment=$Comment; } -:if ([ /system/scheduler/get $ScriptName interval ] != $Interval) do={ - /system/scheduler/set $ScriptName interval=$Interval; +:if ([ /system/scheduler/get $SchedName interval ] != $Interval) do={ + /system/scheduler/set $SchedName interval=$Interval; } -:if ([ /system/scheduler/get $ScriptName start-time ] != $StartTime) do={ - /system/scheduler/set $ScriptName start-time=$StartTime; +:if ([ /system/scheduler/get $SchedName start-time ] != $StartTime) do={ + /system/scheduler/set $SchedName start-time=$StartTime; } -:if ([ /system/scheduler/get $ScriptName start-date ] != $StartDate) do={ - /system/scheduler/set $ScriptName start-date=$StartDate; +:if ([ /system/scheduler/get $SchedName start-date ] != $StartDate) do={ + /system/scheduler/set $SchedName start-date=$StartDate; } -:if ([ /system/scheduler/get $ScriptName policy ] != $Policy) do={ - /system/scheduler/set $ScriptName policy=$Policy; +:if ([ /system/scheduler/get $SchedName policy ] != $Policy) do={ + /system/scheduler/set $SchedName policy=$Policy; } +} do={:global ExitOnError; $ExitOnError $0 $Err} } # Add global Function OSUpdateMode diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index eb2959096..d29478bd1 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/268/e6e9840c"; +:global CommitId "main/269/670fec63"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 10:40:03 30.04.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:40:02 30.04.2026."; # The variables are received right here. :global GlobalConfVersion 138; -- 2.52.0