From 9206a5dd7d3ef34a4b02a6cc6bcf5319ae9107eb Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 30 Apr 2026 15:55:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:55:03 30.04.2026. --- html/AM-Backup-UpdateEmail.rsc | 15 +++++++-------- html/AM-GlobalFunc.rsc | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/html/AM-Backup-UpdateEmail.rsc b/html/AM-Backup-UpdateEmail.rsc index 927f53861..e8b92efdd 100644 --- a/html/AM-Backup-UpdateEmail.rsc +++ b/html/AM-Backup-UpdateEmail.rsc @@ -42,7 +42,6 @@ # :if ([ $EditSchedulers "my-script" "1d" "03:41:27" "My custom scheduler comment" false false "jan/01/1970" ] = false) do={:set ExitOK false; :error true;} :set EditSchedulers do={ - :global LogPrint; :local SchedName [ :tostr $1 ]; :if ([ :len $SchedName ] = 0) do={ :return false; } :local Interval [ :tostr $2 ]; @@ -61,7 +60,7 @@ :onerror Err { # Check if scheduler exists, if not - create it :if ([ :len [ /system/scheduler/find where name=$SchedName ] ] = 0) do={ - $LogPrint warning $SchedName ("System Scheduler for script: " . $SchedName . " is NOT SET! Fix It Now!"); + :log warning ($SchedName . "System Scheduler for script: " . $SchedName . " is NOT SET! Fix It Now!"); /system/scheduler/add comment=$Comment interval=$Interval name=$SchedName on-event=$OnEvent policy=$Policy start-date=$StartDate start-time=$StartTime; } # Check if scheduler parameters are correct, if not - fix them @@ -72,7 +71,7 @@ /system/scheduler/set $SchedName interval=$Interval; } :if ([ /system/scheduler/get $SchedName on-event ] != $OnEvent) do={ - /system/scheduler/set $SchedName on-event=$OnEvent; + /system/scheduler/set $SchedName on-event=$OnEvent; } :if ([ /system/scheduler/get $SchedName policy ] != $Policy) do={ /system/scheduler/set $SchedName policy=$Policy; @@ -83,17 +82,16 @@ :if ([ /system/scheduler/get $SchedName start-time ] != $StartTime) do={ /system/scheduler/set $SchedName start-time=$StartTime; } - } do={$LogPrint error $0 ("Failed to add/modify shceduler for '" . $SchedName . "' failed: " . $Err); :return false}; + } do={:log error ($SchedName . "Failed to add/modify scheduler for '" . $SchedName . "' failed: " . $Err); :return false}; :return true; } :if ([ $EditSchedulers $ScriptName $SchedInterval $SchedStartTime $SchedComment ] = false) do={ - $LogPrint error $ScriptName ("Failed to add/modify shceduler for " . $ScriptName . "!"); - :set ExitOK false; + :log error ($ScriptName . "Failed to add/modify scheduler for " . $ScriptName . "!"); + :set ExitOK true; :error true; } - # Local Function CheckOSUpdateMode :local CheckOSUpdateMode; :set CheckOSUpdateMode do={ @@ -101,7 +99,6 @@ :if ([ :len $NewMode ] = 0) do={ :log error ($0 . "/nFunction /$CheckOSUpdateMode received empty value!"); :return false; - :set ExitOK false; :error true; } @@ -116,6 +113,8 @@ :log warning ($0 . "/nFunction /$CheckOSUpdateMode received value: '" . $NewMode . "', but is may be only \"updateOnce\"!"); :return false; } + :return true; + :set ExitOK true; :error false; } diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 3f415fa10..74dab2dfb 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/290/58c18add"; +:global CommitId "main/291/0766014c"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:30:02 30.04.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:55:03 30.04.2026."; # The variables are received right here. :global GlobalConfVersion 138; -- 2.52.0